projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: bd6c211 9baf674)
Merge branch 'master' of vcs.fsf.org:fai-configs
authorLisa Marie Maginnis <lisam@fsf.org>
Fri, 2 Jan 2015 18:10:17 +0000 (13:10 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Fri, 2 Jan 2015 18:10:17 +0000 (13:10 -0500)

Trivial merge