Merge branch '1880-check-duplicate-public-key'
authorTom Clegg <tom@curoverse.com>
Fri, 17 Jan 2014 21:50:19 +0000 (13:50 -0800)
committerTom Clegg <tom@curoverse.com>
Fri, 17 Jan 2014 21:50:19 +0000 (13:50 -0800)
commit89397b66ebc9b8ec82d806fe6a2af2bbefd01161
tree2129db438d5a26c2eeade3f0c4e792a07b4f41cc
parentd14c127786e9ad5490a700654ee513aaa0c53db6
parente1ed5c20e3edc31c7aefe3257679b0db6f3c3316
Merge branch '1880-check-duplicate-public-key'

closes #1880