51023f Merge remote-tracking branch 'origin/master'

Merged and Committed by Petr Machata 13 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	boost.spec
    
        
file modified
+5 -2