Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll 2015-05-25 18:25:55 +02:00
commit dbc538d054
1 changed files with 1 additions and 1 deletions