Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 27 Feb 2010 21:37:10 +0000 (16:37 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 27 Feb 2010 21:37:10 +0000 (16:37 -0500)
commit70972b16874583bb642b093fb9906a0967d69ac3
tree5a54abbc57a53412964a1f651db67d373d814d06
parent6aaa6e0d245e450315a073f62e27c233cefbe9ec
parent7e2a22e0bf48ba58677b68d0950e18d2517b7bb3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info