Merge commit 'refs/merge-requests/26' of git://gitorious.org/konversation/konversatio...
authorEike Hein <sho@eikehein.com>
Sun, 10 Jan 2010 13:52:57 +0000 (14:52 +0100)
committerEike Hein <sho@eikehein.com>
Sun, 10 Jan 2010 13:52:57 +0000 (14:52 +0100)
commit59e0f8c354afb7486a32717e14617c8112abc5f0
tree5baa6005d4b83c8779349cae9a61fa393ebeb5ac
parent298a5fbf089a0b63e61f14c0fadb6e2428ebcd84
parente1cca60118beb5885af4db7286ccb0368473cc73
Merge commit 'refs/merge-requests/26' of git://gitorious.org/konversation/konversation into integration