Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 13 Jan 2011 23:47:56 +0000 (19:47 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 13 Jan 2011 23:47:56 +0000 (19:47 -0400)
commitf351c67d2ae86a49cb6b1e6cc755b5c0feedb288
tree4ab3a6ec1341e643e06d41350d1ef24d6b7b9dc7
parentd75c1209a5b07cae417aabee56c3414743610f93
parent020148fe7c6b17af1f66a113656bff63337ece5e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info