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)
commitb57d1c0fed4a5f41191ed9d9050a58ab42d5768f
treeb4fa4f5c4da60e761622bdd8b7599040ad954958
parent66198806246ca64034bb3c1b1a679d7951c436eb
parent1d15b2a0381f9673fbcb9f9a271b2d57c58ab755
Merge branch 'master' of vcs.fsf.org:fai-configs