Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 29 Apr 2015 17:08:24 +0000 (13:08 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 29 Apr 2015 17:08:24 +0000 (13:08 -0400)
commitab533dee1ff5067784cd14fa280d6e773e1a24e8
tree6d25f3977bc8af1e9a9ae6abdf720369a2f186e0
parent1eb9a36355f64acf2187917dd33e4631c0c7c16c
parenta197cd42df4ea4fd9c8305f3a33629f4c238e9cc
Merge branch 'master' of vcs.fsf.org:fai-configs