Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 25 Jan 2009 23:50:35 +0000 (18:50 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 25 Jan 2009 23:50:35 +0000 (18:50 -0500)
commit35ea80bdfe779edb330c43761f1298a74a854990
treecf34e925b6b447d2ad2c5fac659f1acc56c2050d
parent731fc9e7a2ce818f0b7069cf0353931ec2dc8b43
parent4f098cfd05654b106e52015f0b302c56cafe3b62
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info