[opensips/el5: 6/6] Merge branch 'el6' into el5

[John A. Khvatov]

commit b10f9f3df94e71863f4388c012200df83f8f33d6
Merge: f1028c3 190d578
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Nov 24 02:11:26 2011 +0400

    Merge branch 'el6' into el5

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