Merge tag 'upstream/1.3.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 2 Nov 2014 09:33:24 +0000 (10:33 +0100)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 2 Nov 2014 09:33:24 +0000 (10:33 +0100)
Upstream version 1.3.2


Trivial merge