Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 7 Jan 2015 02:18:52 +0000 (21:18 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 7 Jan 2015 02:18:52 +0000 (21:18 -0500)
commit2ae34d5a031c9a9dcd5d858ce11433a0dadeadf8
treef373c0e97fc66b9df2504a54ac1626a7d6447d7a
parentb4a13bdf15c126d8201a4163f4990cf8dae611de
parentff9cedfd4b5d021cfb59240988f6de4611edeed4
Merge branch 'master' of vcs.fsf.org:fai-configs