projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6adf406 7c9a1c1)
Merge branch 'org' into wtk
authorW. Trevor King <wking@tremily.us>
Sun, 13 Jan 2013 12:13:17 +0000 (07:13 -0500)
committerW. Trevor King <wking@tremily.us>
Sun, 13 Jan 2013 12:13:17 +0000 (07:13 -0500)

Trivial merge
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.