Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 3 Jun 2015 16:01:18 +0000 (12:01 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 3 Jun 2015 16:01:18 +0000 (12:01 -0400)
commit3ba16ee83839411f189009ad0e43007670206745
treeb2d28d4060c9c6621b7e1d3cfe46ff6f84302dac
parent62ce548685a330a4061f2b2a51545e4224c806f6
parent5281d87b08aafa7b764b48b859dda22939efbe97
Merge branch 'master' of vcs.fsf.org:fai-configs