Merge branch 'MAINT_3_4_0' into QA_3_4
commit58be909ab2d76fe8243f93e8c56a88a0f1d077bf
authorMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 12:18:51 +0000 (26 13:18 +0100)
committerMichal Čihař <michal@cihar.com>
Fri, 26 Nov 2010 12:18:51 +0000 (26 13:18 +0100)
tree2f3003e027d8027cf6f54e6ee94ae9d5933c2b93
parent6a14c09699bbf97c620ea8fc9cf02e24ca78120d
parent8ec799d40b3384598aa33fd82b295a2fe37cb898
Merge branch 'MAINT_3_4_0' into QA_3_4