5c0423d Merge branch 'master' into f12/master

Merged and Committed by peter 13 years ago
    Merge branch 'master' into f12/master
    
    Conflicts:
    	.gitignore
    	erlang-ibrowse.spec
    	sources
    
        
file modified
+1 -0
file modified
+18 -14
file modified
+1 -1