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)
commitc7a95a42d6db231d2259ee6ddcb54a7d26d2f4f4
treecbce41f16b2d8d3dea0bdd42ab5e707c067420c7
parent9c3cd04f88c06d5e6ec2d2c1f0b4393a9f59d744
parent77c721a5421595d32b3c87e4e8b73542753329d9
Merge branch 'master' of vcs.fsf.org:fai-configs