Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Thu, 14 May 2015 14:46:59 +0000 (10:46 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 14 May 2015 14:46:59 +0000 (10:46 -0400)
commit804144402bd6b3b52b3e38aff7cc0812ac1ba0c8
tree42b52378dcb1bbecb99cdabe2d8a6c0184f88ccb
parentdd762222fa3c9587009a5d3d3483002b2ad169ae
parent7ef44d84d69d11cb16619abcb7eaff5e833e0ace
Merge branch 'master' of ssh://git.ikiwiki.info
doc/todo/emailauth.mdwn