Issue #14926: merge with 3.2

This commit is contained in:
Sandro Tosi 2012-06-02 19:40:20 +02:00
commit e1b22edd23