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

[Peter Lemenkov]

commit 76c2d7f22fdd0bc5462cebb785123c8164b89443
Merge: 84fcb16 06ffbc5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Jul 11 15:18:34 2011 +0400

    Merge branch 'master' into el6
    
    Conflicts:
    	opensips.spec

 .gitignore                                         |    2 +
 ...ps-0001-Check-for-stale-nonce-in-pre_auth.patch |   70 ++++++++++++++++++++
 ...overlapping-both-auth-realm-and-auth-resp.patch |   29 ++++++++
 opensips.spec                                      |   61 +++++++++++++++--
 sources                                            |    2 +-
 5 files changed, 155 insertions(+), 9 deletions(-)
---