9ad2743 Merge branch 'master' into el6

Merged and Committed by peter 12 years ago
    Merge branch 'master' into el6
    
        
file modified
+1 -0
ejabberd-0010-last-minute-fix-correct-version-in-configure.patch ejabberd-0010-last-minute-fix-correct-version-in-configure-and-in-.patch
file renamed
+8 -23
file modified
+20 -3
file modified
+1 -1