tree f76f7c38cc07213e92040a6eff5c2b50885c62bc
parent 0d30942317f5cb1479d85ae0d45eae04d4c44b6b
parent 1bbd5ecf7f548d679a199bb1a301df305ce598a9
author Sebastian Dröge <sebastian@centricular.com> 1403946866 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1403946866 +0200

Merge tag 'upstream/1.3.90'

Upstream version 1.3.90