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)
commitc2995912c9a05a0f58dc09cd5b7e1696ada38784
treee3c01019d48028476351145e83be00c87ba00c51
parent4ccc37db3028cb17bc22871e4b993cb99d3d762b
parentb75f015b670ecfebad79dd32372c40b0969e8881
Merge branch 'master' of vcs.fsf.org:fai-configs