tree b6daf87f01a1262ccdd44ce2661fa0e6329ba878
parent c8b464976361b24367c8b4e1fd4ef05517db1be1
parent 30f3bf6b15ba711623c053fa9f7e34fbde35347a
author Sebastian Dröge <sebastian@centricular.com> 1411126799 +0300
committer Sebastian Dröge <sebastian@centricular.com> 1411126799 +0300

Merge tag 'upstream/1.4.2'

Upstream version 1.4.2