tree 0cd98270bae4afe25801300cce7cbc17ff59c50f
parent cc5ea62e48afa0faf6b3aa0014245622b313b887
parent 29267c81ce2bca421f1ba044491200b41ed5cfd2
author Ezio Melotti <ezio.melotti@gmail.com> 1361591918 +0200
committer Ezio Melotti <ezio.melotti@gmail.com> 1361591918 +0200

#17249: merge with 3.2.