Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 10 Sep 2010 21:17:23 +0000 (17:17 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 10 Sep 2010 21:17:23 +0000 (17:17 -0400)
commit4c5cf30ff9cc1a7f88a973afcc7c6d838ae578b0
tree93a4e5601ae0c58a35a9dabe2a018b908e8e05df
parentc4ebdd6f467f3361b1f444d9462e10acdbcf9322
parenta3ce17387c2af17a419114ef863afb6f06d4c816
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info