Merge fixes.

src/cpp/ripple/OfferCreateTransactor.cpp

@@ -440,7 +440,7 @@ TER OfferCreateTransactor::doApply()
 	{
 		cLog(lsWARNING) << "OfferCreate: Malformed offer: Bad currency.";
 
-		teResult	= temBAD_CURRENCY;
+		terResult	= temBAD_CURRENCY;
 	}
 	else if (saTakerPays.isNative() != !uPaysIssuerID || saTakerGets.isNative() != !uGetsIssuerID)
 	{

src/cpp/ripple/RippleCalc.cpp

@@ -887,6 +887,7 @@ TER RippleCalc::calcNodeAdvance(
 		{
 			// Get next quality.
 			uDirectTip		= lesActive.getLedger()->getNextLedgerIndex(uDirectTip, uDirectEnd);
+
 			bDirectDirDirty	= true;
 			bDirectAdvance	= false;
 

src/cpp/ripple/Transaction.cpp

@@ -295,10 +295,9 @@ bool Transaction::convertToTransactions(uint32 firstLedgerSeq, uint32 secondLedg
 // options 1 to include the date of the transaction
 Json::Value Transaction::getJson(int options, bool binary) const
 {
-	
 	Json::Value ret(mTransaction->getJson(0, binary));
 
-	if (mInLedger) 
+	if (mInLedger)
 	{
 		ret["inLedger"] = mInLedger;
 

src/cpp/ripple/TransactionFormats.cpp

@@ -78,7 +78,6 @@ void TFInit()
 		;
 
 	DECLARE_TF(SetFee, ttFEE)
-		<< SOElement(sfFeatures,			SOE_REQUIRED)
 		<< SOElement(sfBaseFee,				SOE_REQUIRED)
 		<< SOElement(sfReferenceFeeUnits,	SOE_REQUIRED)
 		<< SOElement(sfReserveBase,			SOE_REQUIRED)

src/cpp/ripple/TrustSetTransactor.cpp

@@ -250,7 +250,7 @@ TER TrustSetTransactor::doApply()
 
 		if (bDefault || CURRENCY_BAD == uCurrencyID)
 		{
-			// Can delete.
+			// Delete.
 
 			terResult	= mEngine->getNodes().trustDelete(sleRippleState, uLowAccountID, uHighAccountID);
 		}