Merge remote branch 'smcv/unescaped-meta'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 18:33:51 +0000 (14:33 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 10 Apr 2010 18:33:51 +0000 (14:33 -0400)
commit002d9e3cb52eadc8c2feb6bfac020b0651c6e0b7
tree4be160afee8b309299ff60bcbf12286bf12b3ebb
parentd1a616df2ed79b1602658c5d10d54ee00afc537e
parent5408279b5ffd7038bb0c279d1379c7e0d21d0a96
Merge remote branch 'smcv/unescaped-meta'

Conflicts:
IkiWiki/Plugin/meta.pm
IkiWiki/Plugin/meta.pm