Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 17:03:08 +0000 (13:03 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 17:03:08 +0000 (13:03 -0400)
commitaf1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8
tree49fdbac3626550b9fa38884c8003e3e32cc60bf3
parentdebdfd45d52d1b200f61d298e0b72a87327d4aae
parent2d411d7729f2afa61afd4fd406747a204b937175
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info