Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Thu, 21 Apr 2016 16:42:41 +0000 (12:42 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Thu, 21 Apr 2016 16:42:41 +0000 (12:42 -0400)
commitbd33c8dad0379f8b5d961431bdba069927d18a93
treecda4daf420c13e220b2848998902908bee87ea25
parent85f21d44606ca000eb877fb305ec6ed2c4f98224
parent566811d7daea01215e2aae92b4c3f8563a3c286d
Merge branch 'master' of vcs.fsf.org:fai-configs