Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 6 Nov 2013 14:51:45 +0000 (10:51 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 6 Nov 2013 14:51:45 +0000 (10:51 -0400)
commit53bf8ec71053f4c3f5bab74aad25b05052cbf745
tree13435227e166ddfabda1efa55ea84720a50da0f7
parent63cc1f5aab0130bdcc6c8ac3485540d78bc6aa59
parent520faae54fc9355d0142e569651591765430db81
Merge branch 'master' of ssh://git.ikiwiki.info