6 Commits

Author	SHA1	Message	Date
James Turk	e6ae2ad634	resolved conflict the wrong way	2012-05-10 11:16:35 -04:00
James Turk	4206539aed	fix merge conflict	2012-05-10 11:13:18 -04:00
Marc Abramowitz	cee1103e21	Add a tox.ini	2012-05-09 23:46:30 -07:00
Marc Abramowitz	4a4dff4e96	Enable python setup.py test	2012-05-09 22:17:34 -07:00
James Turk	448dee151b	change description	2011-09-20 17:15:15 -04:00
James Turk	1067bfcdc4	setup.py	2011-09-20 16:31:22 -04:00