Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 22 Jan 2009 04:04:48 +0000 (23:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 22 Jan 2009 04:04:48 +0000 (23:04 -0500)
commit7c00c46bcabccd38173faa6269f9faeaf4a56f76
treed52cfbdc30d5c51b6a5fddb79bca3d37823e3bb8
parentfd03fd9e0ad1d51a358d4d2953e68e12e8885afe
parenta2738b949a31228ee33e954cfa96b93ddc35f11c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info