tree 324a70bd84ddbc3490f20c0e3413ef1ecc6e3315
parent eba623f88260a9a076ce3a4a71d1d61755327e05
parent f96db83a64bb0ac40d04d27383d7c2defbcec491
author Alex Gaynor <alex.gaynor@gmail.com> 1388790197 -0800
committer Alex Gaynor <alex.gaynor@gmail.com> 1388790197 -0800

Merge branch 'master' into setup-install-extension

Conflicts:
	setup.py