tree 0ed4ae2604137e255166e6e5803bf0e7e5ca3a57
parent 1c9208019461173a0c3d275368e2331befe4a9ad
parent c05f749f91dae26d011bfd0e78ac7b99c2faf663
author Sebastian Dröge <sebastian@centricular.com> 1388137831 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1388137831 +0100

Merge tag 'upstream/1.2.2'

Upstream version 1.2.2