Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 8 Sep 2009 19:01:12 +0000 (15:01 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 8 Sep 2009 19:01:12 +0000 (15:01 -0400)
commit4bc65c1f45704cfdcdb45079ebe2b08ed0ae5cab
tree231e0c934fdc50090b77b3d039180a12c087f283
parent1f828d280a5085f2d9b0c69cbc0d6b4b1a40a105
parent629ff41d919c1427f99fe95c5a02cbeea1243b26
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info