Merge branch 'master' of vcs.fsf.org:fai-configs
authorstephen mahood <mv@fsf.org>
Mon, 23 Feb 2015 17:34:58 +0000 (12:34 -0500)
committerstephen mahood <mv@fsf.org>
Mon, 23 Feb 2015 17:34:58 +0000 (12:34 -0500)

Trivial merge