Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 26 Jun 2013 15:23:59 +0000 (11:23 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 26 Jun 2013 15:23:59 +0000 (11:23 -0400)
commitd1adf36afa154458fd58815adee3cc4e32b03a32
tree4228f49111295ac6033e46eb8d73b66285d56c74
parent428d4065532f5c98aae362059c73d2cdec0ed541
parenta1d42a132ac7d6e7a25bc94abb10ee7ce7a93b1b
Merge branch 'master' of ssh://git.ikiwiki.info