Merge tag 'upstream/0.0.7'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 11 Oct 2014 08:53:49 +0000 (10:53 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 11 Oct 2014 08:53:49 +0000 (10:53 +0200)
Upstream version 0.0.7


Trivial merge