Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Thu, 2 Jun 2011 14:10:59 +0000 (16:10 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 2 Jun 2011 14:10:59 +0000 (16:10 +0200)
commit7a472e9e0cc42b8147e175263961cb9451e9a72a
treef83ae2749787f0cda9ef18425a40e4ecd13bd73d
parent43677c8ab39c540121af5fdfaecf14ff2275556c
parente5c8560006e82846aff4d02de312a7dbe51ff07f
Merge branch 'master' into gregoa