Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 28 Nov 2014 20:40:09 +0000 (15:40 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 28 Nov 2014 20:40:09 +0000 (15:40 -0500)
commit7381bc4f79a79d88595663529ccc4078c77ac73c
treebd1d8832c21faabe4133e86b003cc139fdc96f93
parentf39f2d6f5d219933f000e82e9eacc0fffa2f5213
parentd848115bffa389e4cba542cc99429ebb992ef690
Merge branch 'master' of vcs.fsf.org:fai-configs