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

[John A. Khvatov]

commit 72aa536c7d57add74fbfd7828b5c2e930f25e22f
Merge: b99cd4d 5cf7aa0
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Thu Nov 24 02:01:22 2011 +0400

    Merge branch 'master' into f15

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