Merge branch 'master' of gitorious.org:konversation/konversation
authorEike Hein <hein@kde.org>
Fri, 11 Jun 2010 00:37:43 +0000 (02:37 +0200)
committerEike Hein <hein@kde.org>
Fri, 11 Jun 2010 00:37:43 +0000 (02:37 +0200)
commitab8c61566f82dff4aa84fc19a8873d1e7c5a8e2f
treed301c95898a6e534798856e55e2b7b4faa64963e
parente4dfc45591da19e57ac8d5afef6c2cbd8b39c2b4
parentb9bc3085cbf775ddf5bd546aa0e5875c8267d887
Merge branch 'master' of gitorious.org:konversation/konversation