tree 71302f5f929cac5a16335748d40bf8a95def6610
parent ff9ec7163c82e8e133879bb371e392bfff46be88
parent 8014cf2e603e0f71554ba2c8caf35fda4227a833
author Sebastian Dröge <sebastian@centricular.com> 1411124836 +0300
committer Sebastian Dröge <sebastian@centricular.com> 1411124836 +0300

Merge tag 'upstream/1.4.2'

Upstream version 1.4.2