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

[John A. Khvatov]

commit 21147481945abe6ca43ffae7a80ec38c60fdbd2e
Merge: 190d578 d48875e
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Dec 1 20:37:30 2011 +0400

    Merge branch 'master' into el6

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