Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 30 Oct 2011 16:23:30 +0000 (12:23 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 30 Oct 2011 16:23:30 +0000 (12:23 -0400)
commit3aa41021ad4aa4361b44663fd8dbb1a7dbea72e0
tree6e1706dd80652e992858bb3c20efd4722a3f17d8
parentd564efac5d8b2aa6b1214db58c43ea51095a586f
parent2ac52e16435acc15cc164902b97d50f97b9247e9
Merge branch 'master' of ssh://git.ikiwiki.info