Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 29 Jun 2008 18:09:52 +0000 (14:09 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 29 Jun 2008 18:09:52 +0000 (14:09 -0400)
commit92b04db8833e812786d93a8dad8b9cb3741e5ed6
tree440f16346f03e83648055c049436188cd4e0c1eb
parentb2eceeb7b94ced6328658ca87d916c63a03dcac4
parent8ab0d60271f1723540460189d4f0133f78c9e6e5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info