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

[Peter Lemenkov]

commit cc7c8737bbc0aebcf0489351ca8ca75f6d8a5cc1
Merge: 0b7a8d6 06ffbc5
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Jul 11 15:15:16 2011 +0400

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

 .gitignore                                         |    1 +
 ...stall-modules-by-install-modules-all-in-i.patch |   28 --------
 0002-fixed-install-modules-doc.patch               |   31 ---------
 ...ps-0001-Check-for-stale-nonce-in-pre_auth.patch |   70 ++++++++++++++++++++
 ...overlapping-both-auth-realm-and-auth-resp.patch |   29 ++++++++
 opensips.spec                                      |   20 ++++--
 sources                                            |    2 +-
 7 files changed, 114 insertions(+), 67 deletions(-)
---