projects / ikiwiki.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d9e97c 604037b)
Merge commit 'schmonz/master'
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 22:20:23 +0000 (18:20 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 11 Sep 2009 22:20:23 +0000 (18:20 -0400)
commitc6ac7409bd95af94257f8bd6e5d5fd2530a4aa63
tree5a473b389665578f5b878514684b53cc6712cb67tree | snapshot
parent2d9e97c283cb7b1ecdd524e60bddec17ee638835commit | diff
parent604037b0f258f91c323c07ff985e8732a6d73e86commit | diff
Merge commit 'schmonz/master'

Conflicts:
IkiWiki/Plugin/rsync.pm
IkiWiki/Plugin/rsync.pm diff1 | diff2 | blob | history
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.