Merge branch 'master' of git://gitorious.org/konversation/konversation
authorCarlo Segato <brandon.ml@gmail.com>
Sat, 24 Apr 2010 14:19:19 +0000 (16:19 +0200)
committerCarlo Segato <brandon.ml@gmail.com>
Sat, 24 Apr 2010 14:19:19 +0000 (16:19 +0200)
commit457f137324b2c7d9ae71fafc80289425761b4b5f
treebe915b31ffe007542eba222bae5089c70379b8e0
parent8354d0bd2ae0e4eb11b2b16d62b6430688f0b3ab
parent99dc28818357333cb6dfd0b7bfeae31cb23f512b
Merge branch 'master' of git://gitorious.org/konversation/konversation