Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 28 May 2009 15:06:19 +0000 (11:06 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 28 May 2009 15:06:19 +0000 (11:06 -0400)
commit14cbc42b033c7270e988e42a625b35f54ed35929
tree695b4a3308c6ac485d769a21761b1c0893695e9f
parent52dc080ed149c3c23511fedc513f5a49d1415510
parent817a40b7812d8bb5eacf2d0a265ef175ac74e1ea
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info