Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Thu, 30 Jul 2015 14:30:02 +0000 (10:30 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Thu, 30 Jul 2015 14:30:02 +0000 (10:30 -0400)
commite72c46ada29f4e7204f728a670092cd832a6830a
tree617801f88208821e7f111dd682471e8bf905d1da
parentd04f786833f7b6e2eb58880ab622ae8367519c36
parent31203e821d30416ec2e47be2e90715b6a0dc7a00
Merge branch 'master' of vcs.fsf.org:fai-configs