projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b00eb29 8558c5e)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 17 Jun 2015 15:53:12 +0000 (11:53 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 17 Jun 2015 15:53:12 +0000 (11:53 -0400)

Trivial merge