tree 577d4d9fd58fd469a4e1d1a148806c3cb58728e1
parent b9e1106f6d933881ace85a072bb0dd075438d6ee
parent 501b8c28727a519fa939a0d4b24346ef45f59b5d
author Sebastian Dröge <sebastian@centricular.com> 1443213904 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1443213904 +0200

Merge commit '501b8c28727a519fa939a0d4b24346ef45f59b5d'