projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9b737c 5551505)
Merge remote branch 'smcv/ready/glob-cache'
authorJoey Hess <joey@kitenet.net>
Sat, 20 Nov 2010 16:24:00 +0000 (12:24 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 20 Nov 2010 16:24:00 +0000 (12:24 -0400)

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