Merge tag 'upstream/1.0.1'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 2 Jun 2014 20:02:16 +0000 (22:02 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 2 Jun 2014 20:02:16 +0000 (22:02 +0200)
Upstream version 1.0.1


Trivial merge