Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 15 Jun 2008 23:10:23 +0000 (19:10 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 15 Jun 2008 23:10:23 +0000 (19:10 -0400)
commit43c647edd31c224e0ca07785ef1ac7e856639c09
tree6423a3d5626844897725386f97e20218e323b586
parent4da54999de859c505c26ff2a0a23772939caeffa
parentaab415481de28a7ca3baa7e7d5ba168e962f61e0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info