projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac8ecdc 9bea3db)
Merge commit 'origin/master'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 29 Sep 2009 17:35:41 +0000 (13:35 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 29 Sep 2009 17:35:41 +0000 (13:35 -0400)

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