Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 21:44:47 +0000 (16:44 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 12 Mar 2010 21:44:47 +0000 (16:44 -0500)
commit693a0f1ef2c1a920602191fb3226d6378b1012e8
tree036f552399e365fe5f166a64ab03d65c9e41c93a
parent0c3f59d33aa6af6c327d863a4110337ac9cae898
parentb5e27e60ba38365f3e252df80c2a22503f00eb06
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info