Merge tag 'upstream/1.0.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 3 Jun 2014 06:54:34 +0000 (08:54 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 3 Jun 2014 06:54:34 +0000 (08:54 +0200)
Upstream version 1.0.2


Trivial merge