tree 98b18fc3e45aca822e9aa4998c80511a5d919e08
parent 1a000fa20c44ef8af0c8452598f2d2878390e565
parent ba4ee02b9f1d3569d07cda9b97d54312ac1db401
author Sebastian Dröge <sebastian@centricular.com> 1411125088 +0300
committer Sebastian Dröge <sebastian@centricular.com> 1411125088 +0300

Merge tag 'upstream/1.4.2'

Upstream version 1.4.2