Merge tag 'upstream/1.0.3'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 6 Aug 2014 22:35:07 +0000 (18:35 -0400)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 6 Aug 2014 22:35:07 +0000 (18:35 -0400)
commitb63b5693ca264de13bd5aeafa1675f90de3b29db
tree9fd612151e74cf2815d2373e66814652bfc41c97
parentefe4dbef7f7ec31055165dbf0da81c394cf6cdd5
parentc7769a33301029863318e7a94eb52aa13c0d3620
Merge tag 'upstream/1.0.3'

Upstream version 1.0.3