Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 9 Oct 2009 00:33:58 +0000 (20:33 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 9 Oct 2009 00:33:58 +0000 (20:33 -0400)
commit37ec6a82433aa1d7030bca7cae9d3813a6bdbd1f
tree414d1d2e8d491440fb411b7d1e4b1db76ac14f15
parentbc4ef28f3ebc396096b7eccad04eea6febac8d38
parent3bb00d142a4d31316fc6f0eb1277aa2fafe4dbe9
Merge branch 'master' into dependency-types

Conflicts:
IkiWiki.pm
IkiWiki/Render.pm
debian/changelog
IkiWiki.pm
IkiWiki/Render.pm
debian/changelog
doc/todo/dependency_types.mdwn