Merge tag 'upstream/1.3.3'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 12 Sep 2015 11:58:07 +0000 (13:58 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 12 Sep 2015 11:58:07 +0000 (13:58 +0200)
commit014ea7682800b371ba15ec757946222b2be171f6
treeec3edacf07a168ac3377b9830d5c83a8a0b85245
parenteaa71d2ec0d533c6685554aee300d97fa86b231e
parent7374d64975c9063742d195bd012efd19fa1a1246
Merge tag 'upstream/1.3.3'

Upstream version 1.3.3