tree e517193aa98f02aff5cafb6c943378aaed1325ff
parent 9298a1e3f39fcab29af8a5a8d7e2414812609db6
parent 12682a683987cf320d225bc5b6697cc15c6b44ac
author Sebastian Dröge <sebastian@centricular.com> 1399140049 +0200
committer Sebastian Dröge <sebastian@centricular.com> 1399140049 +0200

Merge tag 'upstream/1.3.1' into debian-experimental

Upstream version 1.3.1