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)
commitf59206913efca168851e1a3f57b1b0f5a50495ec
treefe82ae15f772964a62651fcbaa60acb532115823
parent5189e5a23205e9908f227361521b1b16198e6893
parente248180cc4ebc258fdd5778a26c08287089165b1
Merge tag 'upstream/1.0.1'

Upstream version 1.0.1