Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 14:13:46 +0000 (10:13 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 14:13:46 +0000 (10:13 -0400)
commit68140a8df21cc90b8291da923beac6b52274abe2
tree2e769145b24df57af764812198cbf48c6a3c67e3
parent4cce68ba9dfc5fd6506c666c788aabcafeb610a7
parent7d1b3edf5f6e031fb6edd00c7ff68da4b06abbb4
Merge branch 'master' of ssh://git.ikiwiki.info