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

[John A. Khvatov]

commit aae018af6cce2434d292c50e2ad55ff4296b1fcd
Merge: 9443773 5cf7aa0
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Nov 24 02:02:59 2011 +0400

    Merge branch 'master' into el6

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