Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 03:49:47 +0000 (23:49 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 03:49:47 +0000 (23:49 -0400)
commit606dcbedc91be62f03670179e93b12e5f2e2e556
treea2d2232b552145ac74799a759f8e0e4c62b6c65c
parentde6167a3b03389c0ec8223e7ee101707b6c73953
parent529929e732e1c6604d31b68e81898780de06e640
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info