Merge remote-tracking branch 'origin/MAINT_3_4_10' into QA_3_4
commit0a4357121edd36d8a7784490933cc841fae7e956
authorMichal Čihař <michal@cihar.com>
Wed, 15 Feb 2012 07:01:35 +0000 (15 08:01 +0100)
committerMichal Čihař <michal@cihar.com>
Wed, 15 Feb 2012 07:01:35 +0000 (15 08:01 +0100)
tree3dd033739f069e56d8d764fdad7f023214bef343
parent686fc0a25d5e1596c95a2ac5166ae05def3cd7a4
parente8a12582f9fc7737a6346e26ec9c5de01ced8d52
Merge remote-tracking branch 'origin/MAINT_3_4_10' into QA_3_4