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

[John A. Khvatov]

commit 3867fd4e1def5796a7773b2fed3156c4ad0a3a38
Merge: b10f9f3 d48875e
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Dec 1 20:38:33 2011 +0400

    Merge branch 'master' into el5

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