projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 041f8e3 f0c76aa)
Merge commit 'smcv/openid'
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 18:13:28 +0000 (13:13 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 21 Dec 2008 18:13:28 +0000 (13:13 -0500)

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