Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 31 Jul 2010 19:55:31 +0000 (15:55 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 31 Jul 2010 19:55:31 +0000 (15:55 -0400)
commitb766ff004489467fb5a076f90f05bc2ac5dc8acf
tree5a23303593c042b10775dce1286228cbc3007c79
parentfee00fdb7a4ebb52e90f739cca33def70497620e
parent543bc7af8be315e44ccca575b788e566bc122db2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info