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)
commitcddb9964bcb67249bf9426a3376c062a3d27398b
treefe0fd8ab71d32e28fb8cdc9a24e2d56b1626bb74
parent3e350f1eebb42f67eee676133ad5d80a9e461140
parentec32d69fa628fd396e89cf7d57432d509f28c5ae
Merge tag 'upstream/1.0.2'

Upstream version 1.0.2