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)
Upstream version 1.0.4


Trivial merge