Merge tag 'upstream/1.0.4'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 13 Aug 2014 18:14:03 +0000 (20:14 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 13 Aug 2014 18:14:03 +0000 (20:14 +0200)
commitecad10f9393a6a301dcaf1d5ec4d92563e281481
tree5cedd99723a155a2ceeeebefd94d15986e33a739
parentd8a6a45558558e656df996ba5993555081ba3df3
parent0470c31b8a4293914a6fd9b089503775706da084
Merge tag 'upstream/1.0.4'

Upstream version 1.0.4