Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 21 Jul 2009 07:57:08 +0000 (09:57 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 21 Jul 2009 07:57:08 +0000 (09:57 +0200)
commiteeeda1295f08337f1321860d2b839732a46786e4
tree0834588e062b7c167677c2366d5ffeaf89294811
parent4b1534d5bc969e05488a1f85f42208cbdf3da32e
parent4954ffb558d466f206a2ac8acbf47e251340b723
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info