Merge branch 'master' into gregoa gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 11 Dec 2011 14:09:52 +0000 (15:09 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 11 Dec 2011 14:09:52 +0000 (15:09 +0100)
commita6513dfc3cc0c32f0e99d5c6794056fbeb3a1f68
tree6a5cf2f2f26c83a7a60c8063a59ca6c79d6baa93
parent8a309911899e8019738ca002b55c9d86cf444e33
parente1bc2469231f23d2c52bf47c2d55d88d1eaeacd4
Merge branch 'master' into gregoa