Merge pull request #20 from CryptoManiac/master
authorCryptoManiac <CryptoManiac@users.noreply.github.com>
Thu, 10 Jul 2014 22:13:42 +0000 (02:13 +0400)
committerCryptoManiac <CryptoManiac@users.noreply.github.com>
Thu, 10 Jul 2014 22:13:42 +0000 (02:13 +0400)
commit3e5c012d2a617b80eb61b0796b29e2ba936bb56a
tree8e7be13bcae27807556fc9fe759bf9b50b8da0c3
parent73fec9f7f440a9c4d948c8b2601de3dadb69498b
parent9a775aab97d1312b54023e516ee4a9fa78688d5d
Merge pull request #20 from CryptoManiac/master

Merge recent additions from unstable branch