Merge pull request #463 from TheBlueMatt/encreadme
authorJeff Garzik <jgarzik@exmulti.com>
Wed, 31 Aug 2011 16:32:42 +0000 (09:32 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Wed, 31 Aug 2011 16:32:42 +0000 (09:32 -0700)
Encryption readme update and minor rpc.cpp fixes

1  2 
src/rpc.cpp

diff --cc src/rpc.cpp
Simple merge