]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:18:44 +0000 (20:18 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:19:06 +0000 (20:19 -0400)
commit20052f888277f270ab846bf8b1eb44714c1009d6
tree69f991c3815b5187d8d123bf8fd3fbd85fb5ced0
parent752ccf8b48bab173839b5c7892e9868ee71846f0
parent129cd00bdb03e32df8645b12138cb4c79952775e
Merge branch 'master' into autotag

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