Merge branch 'master' of gitorious.org:konversation/konversation
authorBernd Buschinski <b.buschinski@web.de>
Wed, 3 Feb 2010 15:42:44 +0000 (16:42 +0100)
committerBernd Buschinski <b.buschinski@web.de>
Wed, 3 Feb 2010 15:42:44 +0000 (16:42 +0100)
commitd074318cd55693cbe8e9212442f29a637f0a9b22
treea82cfdcadd30b314fdad14bd442ad19f2c735430
parent9d1fc6e2ee77e37eb33a78b3651e513ff7f3b0a6
parent625788909b07c101bedd6d4a2e7ef0accfac3dff
Merge branch 'master' of gitorious.org:konversation/konversation