projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2fbde0 32a12f8)
Merge branch 'master' of git://git.ikiwiki.info
authorJavier Rojas <jerojasro@devnull.li>
Mon, 13 Sep 2010 00:25:51 +0000 (19:25 -0500)
committerJavier Rojas <jerojasro@devnull.li>
Mon, 13 Sep 2010 00:25:51 +0000 (19:25 -0500)

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