4a252f6 Fix changelog after I messed up merging...

Authored and Committed by Ricky Elrod 11 years ago
    Fix changelog after I messed up merging...
    
        
file modified
+1 -1