projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0f596b 9c6444b)
Merge commit 'smcv/force-uuids' into force-uuids
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 14:43:22 +0000 (10:43 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 14:43:22 +0000 (10:43 -0400)

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