[sip-redirect/el5: 14/14] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 08864b987d88656c4a46c47ea3e64427721272c0
Merge: aae00d9 e5d9f95
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Nov 29 01:11:36 2014 +0100

    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	sip-redirect.spec
    	sources

 .gitignore        |    2 +-
 sip-redirect.spec |   71 +++++++++++++++++++++++++++++++++++++++++++++++-----
 sources           |    2 +-
 3 files changed, 66 insertions(+), 9 deletions(-)
---