Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 8 Nov 2013 18:33:05 +0000 (14:33 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 8 Nov 2013 18:33:05 +0000 (14:33 -0400)
commit85c1479a299121781f5567940d4c983b77bab2ed
tree03128948dc6a8df9aa1e2f9a500847c06a0f3f0d
parent53bf8ec71053f4c3f5bab74aad25b05052cbf745
parent3500632a497ef38ac1f2dcf30b50248a0c88d4d3
Merge branch 'master' of ssh://git.ikiwiki.info