25818fa Merge cleanup.

Authored and Committed by corsepiu 11 years ago
    Merge cleanup.
    
        
file modified
+0 -3