Merge branch 'master' into maint
commit69f7eb115a0a48d4d2808708bcfef9eaf292f64c
authorLukas Fleischer <lfleischer@archlinux.org>
Sun, 26 Feb 2017 09:30:16 +0000 (26 10:30 +0100)
committerLukas Fleischer <lfleischer@archlinux.org>
Sun, 26 Feb 2017 09:30:16 +0000 (26 10:30 +0100)
treee8e4ac633b88099b6836ba3f637b0ab2b1d6a472
parentfdd932ff8d5e5899cfeae9a8b29011fa2cf9d439
parent5fd417d70154470d145c83a4b60693c8d877b016
Merge branch 'master' into maint