projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6235167 dd3274c)
Merge remote branch 'remotes/bzed/extendedlink'
authorJoey Hess <joey@kitenet.net>
Wed, 23 Jun 2010 17:30:14 +0000 (13:30 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 23 Jun 2010 17:30:14 +0000 (13:30 -0400)

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