Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 16 Nov 2009 20:54:28 +0000 (15:54 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 16 Nov 2009 20:54:28 +0000 (15:54 -0500)
commitabec6019a064a06d39a487982ff4165b3d34e7b1
treef74c13e403dc44f1706fc2d20d17affbceeb986a
parent43a1640345e5af8f173a9d3669a4c9e0dfb0a512
parent2d1dfab20a6ed69f48c1696e00a97b44eac84062
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info