tree d1ac1dac1bbd6b34d861db697427b96f84bc2b2e
parent caec4c949aca975c5e86b799f71bcb45e249b51c
parent 42103d1559158b5e871a04a0e58b2acae260dd5a
author Sebastian Dröge <sebastian@centricular.com> 1388138405 +0100
committer Sebastian Dröge <sebastian@centricular.com> 1388138405 +0100

Merge tag 'upstream/1.2.2'

Upstream version 1.2.2