Merge branch 'master' of https://github.com/CryptoManiac/novacoin
authoralex <alex@alex-VirtualBox.(none)>
Sun, 12 Jan 2014 08:51:47 +0000 (12:51 +0400)
committeralex <alex@alex-VirtualBox.(none)>
Sun, 12 Jan 2014 08:51:47 +0000 (12:51 +0400)

Trivial merge