| commit | 327742c8e6271e2b6d809e891bd8e518b89994d9 | [log] [tgz] |
|---|---|---|
| author | Alex Gaynor <alex.gaynor@gmail.com> | Fri Jan 03 15:03:17 2014 -0800 |
| committer | Alex Gaynor <alex.gaynor@gmail.com> | Fri Jan 03 15:03:17 2014 -0800 |
| tree | 324a70bd84ddbc3490f20c0e3413ef1ecc6e3315 | |
| parent | eba623f88260a9a076ce3a4a71d1d61755327e05 [diff] | |
| parent | f96db83a64bb0ac40d04d27383d7c2defbcec491 [diff] |
Merge branch 'master' into setup-install-extension Conflicts: setup.py