Merge remote branch 'davrieb/autotag' into autotag
authorJoey Hess <joey@kitenet.net>
Sat, 17 Apr 2010 16:50:23 +0000 (12:50 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 17 Apr 2010 16:50:23 +0000 (12:50 -0400)
commit54f600af14bf6dc067ffc30ec6f22d517001fe99
treeddd20f6f03bc376700f8ebac24f360bf1fe3b269
parent7fcc0faf8367c5ae64a3ff06d0d74baa063c4dfc
parent981400177d68a279f485727be3f013e68f0bf691
Merge remote branch 'davrieb/autotag' into autotag

Conflicts:
IkiWiki.pm
IkiWiki/Plugin/tag.pm
IkiWiki.pm
IkiWiki/Plugin/tag.pm
IkiWiki/Render.pm