Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 3 Apr 2015 01:35:06 +0000 (21:35 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 3 Apr 2015 01:35:06 +0000 (21:35 -0400)
commitcc44f89aaf77c66fe5a74c87becf2e4016852501
tree55ac12c0fc55e45e86c58f8e62beee9953a3a103
parent123673f32e4dc96b72f2a472c92399a14cc6ac18
parent8af09394f76f8f9847af61a4fd1e03b536381f35
Merge branch 'master' of vcs.fsf.org:fai-configs