Merge tag 'upstream/1.1.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 19:58:38 +0000 (21:58 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 19:58:38 +0000 (21:58 +0200)
commit9aa9c8d3823d79755ddd1aa49b9af6198e24d4e2
tree2b08cc4e38fbfde521847c74b19df23f3dda2974
parent75fa49ffb0c9c8b60328c13ec8613299d094a2e5
parent5c1e07fec97e34a94331b6b47e25c98f2b2e4cce
Merge tag 'upstream/1.1.2'

Upstream version 1.1.2

Conflicts:
configure