Merge branch 'master' into 1880-check-duplicate-public-key
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Jan 2014 21:06:14 +0000 (16:06 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Jan 2014 21:06:14 +0000 (16:06 -0500)
commit7ad430f157028a8f8ab52c6f17c4864ada271667
treefab72bef7b7e16dd63e9556c9dc5676265a0486b
parentd8fde97325067566bcdb877795eaa56a8ee8c201
parent1cb10e779a249bf82b0cf846a8976815da44eaa3
Merge branch 'master' into 1880-check-duplicate-public-key