Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 11 Aug 2013 12:58:54 +0000 (14:58 +0200)
committerJoey Hess <joey@kitenet.net>
Sun, 11 Aug 2013 12:58:54 +0000 (14:58 +0200)
commit63078f2e4f145f8e14e281ed1eb265a67b87b9ea
tree9f5b8474f574a6a15497a18caacae9d5ef933575
parent0d5019fcdd069317ab7648c25d8d8c61efbd98ee
parent854588d33d9cbfa13503bdc988961f17197669e1
Merge branch 'master' of ssh://git.ikiwiki.info