[Swan-commit] Changes to ref refs/heads/master

2014-01-18 Thread D. Hugh Redelmeier
New commits: commit 31fb415c3f45bbf333457be7aa4bbd5ae84539ae Author: D. Hugh Redelmeier h...@mimosa.com Date: Sat Jan 18 09:33:27 2014 -0500 tidy certificate handling commit 8e653227426ecc0eb3d272c98ef7306f115f212c Author: D. Hugh Redelmeier h...@mimosa.com Date: Sat Jan 18 09:30:45 2014

[Swan-commit] Changes to ref refs/heads/master

2014-01-18 Thread D. Hugh Redelmeier
New commits: commit 28bacb320e269ce5385af4d469d66a37e8bc29c2 Merge: fc72cb6 262ac3a Author: D. Hugh Redelmeier h...@mimosa.com Date: Sat Jan 18 21:28:37 2014 -0500 Merge branch 'master' into xauth_2014jan12 Conflicts: include/constants.h Unnoticed conflict: