Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 5 May 2010 00:36:21 +0000 (20:36 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 5 May 2010 00:36:21 +0000 (20:36 -0400)
commite44ccca13c61bd9105ad3de24506523d8d9bdb93
tree87c6bf6a7e3275813b883bf1f44ff22e8212d29d
parent953c28a702202cb5a736765acb838ebfdd505c6a
parent93f8000d584312049fac6b52d8eac4206aa1bedc
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info