Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 13 Jun 2011 16:50:26 +0000 (12:50 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 13 Jun 2011 16:50:26 +0000 (12:50 -0400)
commit38dd85c7994049e4594df1f395ca7bde3dee8895
tree4e41a808cdbf1d27d339a374deeda1f0b2aae31d
parentd93842ffc7943a6abbf320d2543600339691204f
parent9be66582f0622401a46d661ee2efa9ad51aace7e
Merge branch 'master' of ssh://git.ikiwiki.info