Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 18:40:50 +0000 (13:40 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 18:40:50 +0000 (13:40 -0500)
commit72a2fa9441dc37bc2a6ce6337b940271a66b6ec1
tree2a1cf33866bd41c679079a0a38dceac1d21ab0fc
parent700c4bef294a792d507f6cfc34dd4dd5427f2a7f
parentfb9130c18c073d263d3eaa1dd5ef1e78b60f868a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info