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

[Peter Lemenkov]

commit 5c3d9be1a7a9f841428447f51e8318359a4ff9fb
Merge: 5434649 f0d75b0
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Apr 19 13:18:32 2012 +0400

    Merge branch 'master' into f15

 .gitignore                                         |    1 +
 ...ps-0001-Check-for-stale-nonce-in-pre_auth.patch |    8 +-
 ...-unknown-options-to-be-passed-to-rtpproxy.patch |   31 ++++++++
 opensips.service                                   |   12 +++
 opensips.spec                                      |   75 ++++++++++++++++++--
 sources                                            |    2 +-
 6 files changed, 119 insertions(+), 10 deletions(-)
---