Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 26 Feb 2011 00:12:09 +0000 (20:12 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 26 Feb 2011 00:12:09 +0000 (20:12 -0400)
commit4d1942d1ba73e39fd246cee6579f2d788ed2a0af
treebd2a138c00f03ced849b99afb3e85085a511333d
parentc58e0a97bffc87edb4fa16faad2878815e60613f
parenta07a3d1baea183800e41caf4341f31e691a692e7
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info