Merge branch 'master' of gitorious.org:konversation/konversation
authorEike Hein <hein@kde.org>
Mon, 17 May 2010 02:47:13 +0000 (04:47 +0200)
committerEike Hein <hein@kde.org>
Mon, 17 May 2010 02:47:13 +0000 (04:47 +0200)
commitd998a999bfdc080a2d64e7444be1e619b744601b
tree294932243a25802949b1d6ca162a45c67ae49abe
parentfa49cee5e4804387ca212b55375accb62e5e7332
parent6b03f12618529ce6444bdd6f1baa924dc08658aa
Merge branch 'master' of gitorious.org:konversation/konversation