Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 25 Sep 2011 15:07:24 +0000 (17:07 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 25 Sep 2011 15:07:24 +0000 (17:07 +0200)
commit62218d9b082bf37952ee4aecd37a6cee48943f63
tree758eae6d49a903ac676f3698fa3a4b0a255e29d2
parentf8ec64472ec690ea5f67c8fec7ad260a962c95a5
parent02de77283931c1c9a258abf7d4a5d51ab248ad30
Merge branch 'master' into gregoa