tree b4e9a4791cc8d74baa700d945fd1e5608cee456a
parent 3def83883e9f7d26b253d73d8d97a52d5491027e
parent adbd32cad8bdea190c31912d8a922f6dd992d041
author Sebastian Dröge <sebastian@centricular.com> 1409139126 +0300
committer Sebastian Dröge <sebastian@centricular.com> 1409139126 +0300

Merge tag 'upstream/1.4.1'

Upstream version 1.4.1