Merge branch 'QA_3_4'
commite4b52c6e7b810b144dfbe4ffa93c1f6934e5c9f8
authorMichal Čihař <mcihar@novell.com>
Wed, 1 Dec 2010 08:52:42 +0000 (1 09:52 +0100)
committerMichal Čihař <mcihar@novell.com>
Wed, 1 Dec 2010 08:52:42 +0000 (1 09:52 +0100)
tree4d0d2867c7ede4f53e8e23626545c3f44d0e423a
parent795b6c7203ee529914125334a6cefcc58a907b7c
parentd1330c2a17798abff8dfee6bc72d29bd79167820
Merge branch 'QA_3_4'

Conflicts:
po/sl.po
po/sl.po