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

[John A. Khvatov]

commit 1c1e12c2deb9332f3955bcf4d0d5157b85474d0f
Merge: 5cf7aa0 d48875e
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Dec 1 20:30:49 2011 +0400

    Merge branch 'master' into f16

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