Merge branch 'maint'
commitfce4f36e4ff79e90a19bf00fa69b89053b4f62a5
authorLukas Fleischer <archlinux@cryptocrack.de>
Fri, 7 Dec 2012 22:24:22 +0000 (7 23:24 +0100)
committerLukas Fleischer <archlinux@cryptocrack.de>
Fri, 7 Dec 2012 22:24:22 +0000 (7 23:24 +0100)
treee3444665d01050168bd9d50a3477fb6656b2058c
parent20407bb8c60ff705b47df707e21a3e0f73faf239
parent332875bbfeb15340b1d67a8f9382e67c4df52eab
Merge branch 'maint'