Merge remote-tracking branch 'origin/QA_3_4'
commitadc6788103da8976b400b226eb698ca8212af9fe
authorMichal Čihař <michal@cihar.com>
Mon, 15 Aug 2011 07:52:28 +0000 (15 09:52 +0200)
committerMichal Čihař <michal@cihar.com>
Mon, 15 Aug 2011 07:52:28 +0000 (15 09:52 +0200)
treeb20bf4b38e2c8685bd9d0d73b01fd3b26cd85175
parent9a2eed6728a425c5dafed6f2837104e7e0e65e16
parent1d071050733e206f79a593b717ad77d412abda9a
Merge remote-tracking branch 'origin/QA_3_4'