projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 116dc9b 23240f0)
git push
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 10 Jul 2015 15:38:40 +0000 (11:38 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 10 Jul 2015 15:38:40 +0000 (11:38 -0400)
Merge branch 'master' of vcs.fsf.org:fai-configs


Trivial merge