Auto merge of #2068 - bitcartel:2045_sendmany_fee_zero, r=bitcartel

author zkbot <[email protected]>

Thu, 9 Feb 2017 18:56:44 +0000 (18:56 +0000)

committer zkbot <[email protected]>

Thu, 9 Feb 2017 18:56:44 +0000 (18:56 +0000)
author zkbot <[email protected]>
Thu, 9 Feb 2017 18:56:44 +0000 (18:56 +0000)
committer zkbot <[email protected]>
Thu, 9 Feb 2017 18:56:44 +0000 (18:56 +0000)
diff --cc qa/rpc-tests/wallet_protectcoinbase.py
Simple merge
diff --cc src/wallet/asyncrpcoperation_sendmany.cpp
Simple merge
diff --cc src/wallet/rpcwallet.cpp
Simple merge
author	zkbot <[email protected]>
	Thu, 9 Feb 2017 18:56:44 +0000 (18:56 +0000)
committer	zkbot <[email protected]>
	Thu, 9 Feb 2017 18:56:44 +0000 (18:56 +0000)
		1	2
qa/rpc-tests/wallet_protectcoinbase.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/asyncrpcoperation_sendmany.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/rpcwallet.cpp	patch \|	diff1 \|	diff2 \|	blob \| history