[opensips/f14: 2/2] Merge branch 'master' into f14

[John A. Khvatov]

commit 32c443b2b25cd411a3672b7621daa8cdb29a9a0a
Merge: db67689 5cf7aa0
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Nov 24 02:02:04 2011 +0400

    Merge branch 'master' into f14

 .gitignore    |    1 +
 opensips.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---