Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Dec 2008 21:11:13 +0000 (16:11 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Dec 2008 21:11:13 +0000 (16:11 -0500)
commitc4f3d0554a02eba93d94d4c0914f4afddf85274b
tree1db225e14c4e05d2522ee122ee2845b69e3e83d5
parent733c7592b7f7103cc73dc563e827da2a0bab8674
parent7da319efc69089662f9635216bbcc48ca53fe606
Merge branch 'master' into next
IkiWiki.pm
IkiWiki/Plugin/inline.pm
debian/changelog
doc/plugins/write.mdwn