Merge branch 'patch' of ssh://github.com/svost/novacoin into svost-patch

diff --cc src/key.h
Simple merge

diff --cc src/main.cpp
index f8af9df,970dd7e..3ab03f2
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -2347,9 -2347,9 +2347,9 @@@ bool CBlock::AcceptBlock(
          return DoS(100, error("AcceptBlock() : incorrect %s", IsProofOfWork() ? "proof-of-work" : "proof-of-stake"));
  
      int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
-     int nMaxOffset = 12 * 3600; // 12 hours
+     int nMaxOffset = 12 * nOneHour; // 12 hours
 -    if (pindexPrev->nTime < 1450569600)
 -        nMaxOffset = nOneWeek; // One week until 20 Dec, 2015
 +    if (fTestNet || pindexPrev->nTime < 1450569600)
-         nMaxOffset = 7 * 86400; // One week (permanently on testNet or until 20 Dec, 2015 on mainNet)
++        nMaxOffset = 7 * nOneWeek; // One week (permanently on testNet or until 20 Dec, 2015 on mainNet)
  
      // Check timestamp against prev
      if (GetBlockTime() <= nMedianTimePast || FutureDrift(GetBlockTime()) < pindexPrev->GetBlockTime())

diff --cc src/wallet.cpp
Simple merge