Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 7 Sep 2010 16:30:40 +0000 (12:30 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 7 Sep 2010 16:30:40 +0000 (12:30 -0400)
commit21b6fa937b11db46359a1a6aec85d33aca0551a8
treef0c01ad49ad52e064d2dd276e4f241859899020c
parent8a6f4a7e50c247c061fd74b535d0f292aca6bda7
parent0842297678e72819273cd3bfa52420958b36c7e2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info