Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 19 Mar 2010 17:39:51 +0000 (13:39 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 19 Mar 2010 17:39:51 +0000 (13:39 -0400)
commita2e387d64be7c68400f5c80bcb7da973ed05fa3d
treef0412f1f95920a5e2ff3c06566bfd49a76b09f3e
parentcbf269eee29a66e1350e5553f38eee5b4683be8a
parent96a54b35fe2cdcdc1450b5d38c80e7b27b428c14
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info