Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Thu, 7 Jul 2016 17:37:51 +0000 (13:37 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Thu, 7 Jul 2016 17:37:51 +0000 (13:37 -0400)

Trivial merge