Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 17 Jun 2015 15:53:12 +0000 (11:53 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 17 Jun 2015 15:53:12 +0000 (11:53 -0400)
commit6df50b7a74869ddf0e1b4a6d27bcd5aae28e9075
tree241d3a09c03320b5dfc5942bb3c83d43abf0ef0c
parentb00eb29146d48517875863314cf7bfa8d08731e1
parent8558c5e1f3d889abc966b0d741dd36a428365a4f
Merge branch 'master' of vcs.fsf.org:fai-configs