]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 23:47:38 +0000 (19:47 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 21 Apr 2010 23:47:38 +0000 (19:47 -0400)
commit789e68a8b1a451133d9308ecd800140e2ed6f626
tree752f955bd5dd421891ec423ebabef07a8712cc5b
parent8cde2365e43f1c96432dcedb378be55d2308dd08
parent77779dc4a09a9b686935e8e615cf2502f7125bb4
Merge branch 'master' into autotag

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