Merge commit 'schmonz/master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 10 Sep 2009 20:18:27 +0000 (16:18 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 10 Sep 2009 20:18:27 +0000 (16:18 -0400)
1  2 
IkiWiki/Plugin/cvs.pm
IkiWiki/Wrapper.pm

Simple merge
Simple merge