Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 15 Dec 2007 17:29:25 +0000 (12:29 -0500)
committerJoey Hess <joey@kitenet.net>
Sat, 15 Dec 2007 17:29:25 +0000 (12:29 -0500)
commit5e3a2fb6b102e2a7cb332993b128f17f271ff1fd
tree6f07226bac8600155c469bb259c56f8ab8c3c834
parent290dfde6d452a4c465b94df0276e7d2f7d98a6a4
parent8d5facac68791c8075834ec3dcb83b7f26ef964a
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info