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)
commit4c01ba89aac969b4c19190dd8f27329b5dd24a6e
treef1709c69c0c1b3a970ee3f5a7ae4b0206673fafa
parentf676f3e5008b764e8bd03eaadc62775083953b5a
parent4c50d430bea4b8462b0ae7ab70baf3f538f87718
Merge tag 'upstream/1.1.1'

Upstream version 1.1.1