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)
commit51f2ef209d26bd71f4dde568802e614ab0f395dd
tree2067be25a341c71082673bddf6749ec601c9ef5b
parent96e470bcb70cd2e3af623e3428f14e6a5b826b4c
parent634939b8eb0d4d8fbf2bfcafd98776f9ce3c1f52
Merge tag 'upstream/1.3.2'

Upstream version 1.3.2