projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f39f2d6 d848115)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 28 Nov 2014 20:40:09 +0000 (15:40 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 28 Nov 2014 20:40:09 +0000 (15:40 -0500)

Trivial merge