projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eb9a36 a197cd4)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 29 Apr 2015 17:08:24 +0000 (13:08 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 29 Apr 2015 17:08:24 +0000 (13:08 -0400)

Trivial merge