Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commite3596dbaecb69711616b7bf3b3ef363ee5929293
authorJoey Hess <joey@kitenet.net>
Thu, 5 May 2011 20:23:47 +0000 (5 16:23 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 May 2011 20:23:47 +0000 (5 16:23 -0400)
tree35fc13cc2e780ec91f8cfd413687fc57eb93b085
parent4a27adfa72b66dea7972a1e6d946655da6882e72
parent01783bacf854f6daa0771dba10e859f46a3ccc9c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info