Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 15:58:11 +0000 (11:58 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 15:58:11 +0000 (11:58 -0400)
commite93ec71748c2014d18375ed11dd28004ecce5df6
tree80b9c0d617cb5929fbb0b8184f8d22a1916a800e
parentcbfcaede12f205217aba633a80f53882d5424dc8
parentf3b561721bca340baf2fff9a9547480457556afb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:

doc/todo/aggregate_to_internal_pages.mdwn
doc/todo/aggregate_to_internal_pages.mdwn