Merge branch 'QA_3_4'
commitd013e387e8ca662abf3e6d65495fbe42c2924162
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 14:38:51 +0000 (26 15:38 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 14:38:51 +0000 (26 15:38 +0100)
treea40bd37cdb70d963f664630442150f215345055b
parent87fa9bd524efe78c45d79f05ccec83612e03c9e4
parent1486abddef7f4e5e317b4a27fee01849d7b429b0
Merge branch 'QA_3_4'