[sip-redirect/el6: 11/11] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 15d77f678d7da72c81c613687dbaa831c7d4eb24
Merge: 1560019 e5d9f95
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Nov 29 01:09:28 2014 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

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