projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4a13bd ff9cedf)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 7 Jan 2015 02:18:52 +0000 (21:18 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 7 Jan 2015 02:18:52 +0000 (21:18 -0500)

Trivial merge