b14c456 fix changelog entry after conflict resolution

Authored and Committed by bonzini 9 years ago
    fix changelog entry after conflict resolution
    
        
file modified
+1 -1