Merge pull request #11 from CryptoManiac/current
author0xDEADFACE <masmfan@gmail.com>
Wed, 2 Apr 2014 21:39:56 +0000 (14:39 -0700)
committer0xDEADFACE <masmfan@gmail.com>
Wed, 2 Apr 2014 21:39:56 +0000 (14:39 -0700)
Merging of "current" branch


Trivial merge