Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 16:17:04 +0000 (12:17 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 16:17:04 +0000 (12:17 -0400)
commit9e1c7e7d9aedf0dc4a9ad2bf36c582e56e0d2510
tree84a94b58ad89fa14b5c1fdb4c5264a82b0fc8c64
parent99ec944766e87d5918fbec62c417f44d865fa727
parent9cc28ac18ca946b56e43363623dc258949c89537
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info