Merge tag 'upstream/1.1.3'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 27 Oct 2014 21:23:40 +0000 (22:23 +0100)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 27 Oct 2014 21:23:40 +0000 (22:23 +0100)
commit9fe5b6458916c2781046b73be8e636ddbcf526ca
treeacf66d87cf5f49462af393a2d982bd7bb80cfbe3
parentfcb1cc0ac8065818b60cd4c43e19677698d6d752
parentd04180cf2457a7aadcf0d0b88a9b13c9a9820254
Merge tag 'upstream/1.1.3'

Upstream version 1.1.3