projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adee74a 4fb0e87)
Merge branch 'master' of git://git.ikiwiki.info
authorJonas Smedegaard <dr@jones.dk>
Sun, 19 Jul 2009 18:21:16 +0000 (20:21 +0200)
committerJonas Smedegaard <dr@jones.dk>
Sun, 19 Jul 2009 18:21:16 +0000 (20:21 +0200)

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