Merge commit 'schmonz/master' into cvs
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:16:28 +0000 (17:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 4 Sep 2009 21:16:28 +0000 (17:16 -0400)
commit8c55424b11edbe1fd3e6ff1e20ec85c1f3c6e593
tree28a3efb4e46fe33f6a7456b869461a3d5dbecb35
parentfc2bd0afe17a235a0ddfad0a5656c3683d8d180a
parentab88adc5e401f3dad8bc812965b78b45fd08fa26
Merge commit 'schmonz/master' into cvs

Conflicts:
IkiWiki/Plugin/cvs.pm
IkiWiki/Plugin/cvs.pm