Merge branch 'QA_4_3'
commit80daea0abf616f77977411647a5012bbb98c23bf
authorMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 08:14:40 +0000 (4 09:14 +0100)
committerMichal Čihař <michal@cihar.com>
Thu, 4 Dec 2014 08:14:40 +0000 (4 09:14 +0100)
tree0b191404bc304f3540e48aa01189dbd65493d15d
parent49b017cd8356425d3b127567b1a06d6bd3b33424
parent680352b372b52e011c4f207961837ba4f2b11faa
Merge branch 'QA_4_3'