04bcdc8 Merge remote branch 'origin/master' into el6

Merged and Committed by robert 12 years ago
    Merge remote branch 'origin/master' into el6
    
        
file modified
+1 -6
bitlbee-3.0.5-des3-implement.patch bitlbee-des3-implement.patch
file renamed
+3 -3
bitlbee-3.0.5-installP.patch bitlbee-installP.patch
file renamed
+14 -20
file modified
+15 -9
file modified
+1 -1