Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 24 Nov 2009 02:53:07 +0000 (21:53 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 24 Nov 2009 02:53:07 +0000 (21:53 -0500)
commitc6daf3b022390f0b45c60885c50e2f19fde966d3
tree128c94ae047ef726010e5412c8c15afa3280fdd8
parentca7a05cd6d0608adac13576e8242fc757d054a7f
parentb8ba8509adb5e8d84670d9f478e790363a89a526
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info