Merge branch 'master' of vcs.fsf.org:fai-configs
authorstephen mahood <mv@fsf.org>
Mon, 5 Jan 2015 22:25:46 +0000 (17:25 -0500)
committerstephen mahood <mv@fsf.org>
Mon, 5 Jan 2015 22:25:46 +0000 (17:25 -0500)

Trivial merge