projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: bbce8b1 dfbe3ce)
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 18:13:24 +0000 (14:13 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 21 Nov 2011 18:13:24 +0000 (14:13 -0400)

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