Merge tag 'upstream/1.0.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 3 Jun 2014 09:57:23 +0000 (11:57 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 3 Jun 2014 09:57:23 +0000 (11:57 +0200)
commit434e47440fdd1167c49ed402fc1f5234124810de
tree945c0d5cbe81f6a46161dfddba927c4825a4f1b6
parent383095e38d0fa73b96430aac4e6b17b6627fe077
parentc271a4d106a1242ff18b6f5aeb3f56280c7eaf2c
Merge tag 'upstream/1.0.2'

Upstream version 1.0.2