projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 123673f 8af0939)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 3 Apr 2015 01:35:06 +0000 (21:35 -0400)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 3 Apr 2015 01:35:06 +0000 (21:35 -0400)

Trivial merge