projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bfeb51 187128d)
Merge commit 'remotes/jonas/underlay-da' into integration
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 20 Jul 2009 02:47:45 +0000 (04:47 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 20 Jul 2009 02:47:45 +0000 (04:47 +0200)

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