Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 8 Mar 2011 01:56:04 +0000 (21:56 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 8 Mar 2011 01:56:04 +0000 (21:56 -0400)
commitd162bf767e1e57502c4a767fa5a6ec42a5857c59
treebfaff726a76300013005292b37c62b534234ce81
parent9ef5139918dbe3f4cf0b3310c76dd31090925406
parentf486cf6b77e4718a33eaa2b16bd17cdb67c47044
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info