Merge tag 'upstream/1.5'
authorgregor herrmann <gregoa@debian.org>
Tue, 21 Feb 2012 18:45:15 +0000 (19:45 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 21 Feb 2012 18:45:15 +0000 (19:45 +0100)
commit36ec7e8415508c1494053679e3acfd4ed5da7eef
treec1e67309cf154fe2b9c2b7bd90984f0775ed9702
parentc7c133bfa88d015362b283e8678ec0e3225b67d7
parent3346f81a6087bf776229c1bf6a9054955511fd6d
Merge tag 'upstream/1.5'

Upstream version 1.5