Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 30 Apr 2010 18:10:17 +0000 (14:10 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 30 Apr 2010 18:10:17 +0000 (14:10 -0400)
commit3e6cbc319094fa088c873071cabf7b7bf7add0eb
tree5dc1f138270a4e8624820718b477f736e9097d95
parent8ce5c7773884504c3936cb6e91e5a05ac4c1073d
parent9fb15ec9fec8903776be0be01eaed0e7bb7d5009
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info