tree 4317748f72865d37a93dde1003115f1eb551c7a8
parent d404f322843909a91d4cb56ba38f80813a45cdac
parent 1b9a983fee38a46ddbd8c39a533db172818760df
author Sebastian Dröge <sebastian@centricular.com> 1397915267 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1397915267 +0200

Merge tag 'upstream/1.2.4'

Upstream version 1.2.4