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

[John A. Khvatov]

commit 54346494e02829f13eb50d8a8a32a8d64ed64152
Merge: 72aa536 d48875e
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Dec 1 20:34:49 2011 +0400

    Merge branch 'master' into f15

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