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

[John A. Khvatov]

commit 8cfab5445d9dd3f4e7feabbacd7485e5d6e2c91c
Merge: 32c443b d48875e
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Dec 1 20:36:28 2011 +0400

    Merge branch 'master' into f14

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