| commit | 446a457218e3f793f4fec6b73e719c37bfef7d6e | [log] [tgz] |
|---|---|---|
| author | Donald Stufft <donald@stufft.io> | Sun Aug 11 17:38:13 2013 -0400 |
| committer | Donald Stufft <donald@stufft.io> | Sun Aug 11 17:38:13 2013 -0400 |
| tree | ff8636929592945493350a70bea0c3df1e3f0f8a | |
| parent | b19736c8ffdb2bfe243097cae55b60d855e7a0fe [diff] | |
| parent | 09f53578923c241fbb76c0be6bdf725f3b96f528 [diff] |
Merge branch 'master' into simple-symmetric-encryption Conflicts: setup.py