Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 1 Sep 2011 15:38:46 +0000 (11:38 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 1 Sep 2011 15:38:46 +0000 (11:38 -0400)
commitad22a39cfe57d6ed1e80434276c7c77dcbd217c7
treeab703cdc519f0267e4fe612641aace20c35eb2cf
parent7d2b68cd16dd50a76b3b93699e59b7ec4c00a907
parent37a0eb353ea56d5e53cbe191e86844b17bf4c5ce
Merge branch 'master' of ssh://git.ikiwiki.info