From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Wed, 3 Jun 2015 16:01:18 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:fai-configs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3ba16ee83839411f189009ad0e43007670206745;p=fai-configs.git

Merge branch 'master' of vcs.fsf.org:fai-configs
---

3ba16ee83839411f189009ad0e43007670206745