Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 9 Dec 2007 17:38:28 +0000 (12:38 -0500)
committerJoey Hess <joey@kitenet.net>
Sun, 9 Dec 2007 17:38:28 +0000 (12:38 -0500)
commit64d550b14a38f826c662306d89ebd9f587335658
tree94225b8e390eb4d2a7e5a668185e7ded33b06fd0
parentae471ccf0450b3c015cdf06dc70c0cde958e54ea
parenta1d4e3ba47d962ca7455284b88fbfea1604b7cdd
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info