Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 1 Mar 2009 20:07:14 +0000 (15:07 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 1 Mar 2009 20:07:14 +0000 (15:07 -0500)
commitb7e63896057ddeb5ce5986fc7c7bf88b99324be7
treec06fd797f24b6ea155c920edcc5f4ba59c938e02
parent062f87ce3807155ff57bf316685f9bb500726867
parent2c30a32313fbf15e7cdb53f08ba22ed47336e05e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info