Merge branch 'maint'
commitfe90b4bc3e6b2a2a352236359577b3d46728aed6
authorLukas Fleischer <archlinux@cryptocrack.de>
Tue, 25 Oct 2011 07:31:13 +0000 (25 09:31 +0200)
committerLukas Fleischer <archlinux@cryptocrack.de>
Tue, 25 Oct 2011 07:31:13 +0000 (25 09:31 +0200)
tree12a540a5885a59e478d8964de99605faa152c931
parent47c5167acb0a4a2c809c03dc664fea1d130d0c8b
parente53b91fe52be262d94a45769814c1e87c796988b
Merge branch 'maint'