projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d04f786 31203e8)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Thu, 30 Jul 2015 14:30:02 +0000 (10:30 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Thu, 30 Jul 2015 14:30:02 +0000 (10:30 -0400)

Trivial merge