Merge branch 'master' into maint
commitfdd932ff8d5e5899cfeae9a8b29011fa2cf9d439
authorLukas Fleischer <lfleischer@archlinux.org>
Mon, 17 Oct 2016 13:34:21 +0000 (17 15:34 +0200)
committerLukas Fleischer <lfleischer@archlinux.org>
Mon, 17 Oct 2016 13:34:21 +0000 (17 15:34 +0200)
tree07afb8664e18e4d4fb479525b16db6edf026b72b
parentb091fb77580d56dbdca6424f9065581945b8e815
parentc3f464f50fb35ffb7825b90437bd912051a994ee
Merge branch 'master' into maint