Merge branch 'master' of git://gitorious.org/konversation/konversation
authorLaurent Montel <montel@kde.org>
Mon, 22 Mar 2010 13:14:25 +0000 (14:14 +0100)
committerLaurent Montel <montel@kde.org>
Mon, 22 Mar 2010 13:14:25 +0000 (14:14 +0100)
commit4bb0c1a0a4347ed1cb3a5435d48cdc33a0f1a072
treef4b935330043e1fd13b1f24fe376133e49ebcfab
parent08e2c41d8b60fc259e4d3d523544ab5704f42ae3
parent22ba922fab2774142022487c7ec16227db44a1f5
Merge branch 'master' of git://gitorious.org/konversation/konversation