Merge branch 'master' of github.com:jedmccaleb/NewCoin

Conflicts:
	src/cpp/ripple/LedgerAcquire.cpp

src/cpp/ripple/LedgerAcquire.cpp

@@ -528,7 +528,8 @@ int PeerSet::getPeerCount() const
 void LedgerAcquire::filterNodes(std::vector<SHAMapNode>& nodeIDs, std::vector<uint256>& nodeHashes,
 	std::set<SHAMapNode>& recentNodes, int max, bool aggressive)
 { // ask for new nodes in preference to ones we've already asked for
-	assert(nodeHashes.size() == nodeIDs.size() );
+	assert(nodeIDs.size() == nodeHashes.size());
+
 	std::vector<bool> duplicates;
 	duplicates.reserve(nodeIDs.size());
 

src/cpp/ripple/SHAMapSync.cpp

@@ -73,6 +73,7 @@ void SHAMap::getMissingNodes(std::vector<SHAMapNode>& nodeIDs, std::vector<uint2
 				{ // we need this node
 					have_all = false;
 					nodeIDs.push_back(childID);
+					hashes.push_back(childHash);
 					if (--max <= 0)
 						return;
 				}