Merge branch 'maint'
commit2786c16bd5da05dafcb3c6f79f636bc03b9433b6
authorLukas Fleischer <archlinux@cryptocrack.de>
Fri, 3 Oct 2014 11:18:04 +0000 (3 13:18 +0200)
committerLukas Fleischer <archlinux@cryptocrack.de>
Fri, 3 Oct 2014 11:18:04 +0000 (3 13:18 +0200)
tree39db3c89918b191a4b5437e662bf42e27f06675e
parent453e5e9de8b96470034f69f6dc07e3e0857bcef9
parent55586d9c22d5404d3d47aeb4290bc86944f98602
Merge branch 'maint'