Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:19:28 +0000 (20:19 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 00:19:28 +0000 (20:19 -0400)
commitff0cb2a7bf0756bb232cd73fc8bb6616737448c1
tree0329066013075a66c1c7ca782d5136519ed0c61b
parentd4b4b3d988c0b7bfc74876c3b55b787baffc0dcf
parent545029fe4bc11e828da193745c7555c1e8322768
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info