Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 29 Oct 2008 17:37:45 +0000 (13:37 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 29 Oct 2008 17:37:45 +0000 (13:37 -0400)
commit3182cc6710ae85505aba9c670f434aad06d70e1c
treea063d5645c124735790bd603d62ea35e1c2fa4ee
parent309974dfa1dd16add0e042e2218e86c3d32f5a3e
parentf4f099e88e287e12f99c92950af5f8143dc4a8b8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info