Commit Graph

6 Commits (065ac90e0aa85397bd9d0e1b24da52e01e09f6a3)

Author SHA1 Message Date
Joey Hess 065ac90e0a web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 13:28:47 -04:00
Joey Hess e93ec71748 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:

	doc/todo/aggregate_to_internal_pages.mdwn
2008-07-12 11:58:11 -04:00
Joey Hess cbfcaede12 response 2008-07-12 11:56:44 -04:00
Joey Hess f3b561721b web commit by http://smcv.pseudorandom.co.uk/: reference a patch 2008-07-12 11:52:54 -04:00
Joey Hess ac84655f35 web commit by http://smcv.pseudorandom.co.uk/ 2008-07-12 11:38:18 -04:00
Joey Hess a357abc0f9 todo item 2008-01-29 17:31:49 -05:00