Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Thu, 21 Apr 2016 16:42:41 +0000 (12:42 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Thu, 21 Apr 2016 16:42:41 +0000 (12:42 -0400)

Trivial merge