diff mcabber/contrib/merge_history.py @ 1836:b2b3b42944ac

Merge reverted commit
author Mikael Berthe <mikael@lilotux.net>
date Sat, 27 Mar 2010 16:17:11 +0100
parents de14c419b323
children
line wrap: on
line diff