From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Tue, 12 May 2015 21:14:52 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:fai-configs
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4bcee2c0f3625e703528a418d7747a1d334a1c29;p=fai-configs.git

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

4bcee2c0f3625e703528a418d7747a1d334a1c29