projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfed58f 0ddc891)
Merge branch 'master' of git://git.ikiwiki.info
authorJavier Rojas <jerojasro@devnull.li>
Mon, 19 Jul 2010 06:11:28 +0000 (01:11 -0500)
committerJavier Rojas <jerojasro@devnull.li>
Mon, 19 Jul 2010 06:11:28 +0000 (01:11 -0500)

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