tree cebe9f96223b9e28649e9042f3786bf74a5af04e
parent a1c5ac49fe4248c6f5120a6f64282441b5fb84d1
parent 1adbba7bfff7853fca8b02aec57dbe1850d4a55c
author Sebastian Dröge <sebastian@centricular.com> 1397827489 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1397827489 +0200

Merge tag 'upstream/1.2.4'

Upstream version 1.2.4