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)
commit66c93c11ad4125d83635b6331d004ba0216489c8
tree8d1db350a32d1edaed55dcf4b7c0a9d0573ee10b
parentbb9894a769040c67793bb7151e2c1e297fdded44
parentc23a5b7e0eff4119f364a7e1433d11e3a726e470
Merge pull request #11 from CryptoManiac/current

Merging of "current" branch