Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 2 Jan 2015 18:10:17 +0000 (13:10 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 2 Jan 2015 18:10:17 +0000 (13:10 -0500)
commit72c024244e3f2f21aca4eab07b59c91e9f9baca3
tree0528f60a195af33bdba7b564debe54c9d8e91275
parentbd6c211116783d7dc33b5da25aab9123e60cc636
parent9baf67472f76f0583518258f3572e3d9d0d01d5c
Merge branch 'master' of vcs.fsf.org:fai-configs