Merge tag 'upstream/1.1.1'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 1 Sep 2014 12:30:44 +0000 (14:30 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 1 Sep 2014 12:30:44 +0000 (14:30 +0200)
Upstream version 1.1.1


Trivial merge