projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 149fbf9 f65311b)
Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 22:22:57 +0000 (17:22 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 22:22:57 +0000 (17:22 -0500)
Conflicts:

IkiWiki.pm


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