Merge remote-tracking branch 'origin/QA_4_0'
commitf4a9442ca3f59537a660388f762aead1bcdcc5d5
authorMichal Čihař <mcihar@suse.cz>
Mon, 17 Jun 2013 13:53:27 +0000 (17 15:53 +0200)
committerMichal Čihař <mcihar@suse.cz>
Mon, 17 Jun 2013 13:53:27 +0000 (17 15:53 +0200)
tree894c668d4a1af9aa1450bf6de0b9ae9a48284062
parent87dbf5eb75324d23190bc7e92212bf2884f75cf2
parent5f3960680ee4458f4b476260a61f9c0ea61db62c
Merge remote-tracking branch 'origin/QA_4_0'