projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0166e6 2d2767d)
Merge branch 'sudoman-mods'
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 17 Aug 2015 16:47:18 +0000 (12:47 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 17 Aug 2015 16:47:18 +0000 (12:47 -0400)

Trivial merge