projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5df0718 be6ca4c)
Merge remote branch 'smcv/ready/urlto'
authorJoey Hess <joey@kitenet.net>
Sun, 26 Dec 2010 17:53:31 +0000 (13:53 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 26 Dec 2010 17:53:31 +0000 (13:53 -0400)

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