4 Commits

Author	SHA1	Message	Date
James Turk	84764f727b	mergeobject	2015-05-29 15:31:29 -04:00
James Turk	2c69a6dda1	fixes for Django 1.7	2015-05-29 15:15:36 -04:00
James Turk	65f2ae7dac	ensure same class	2015-05-28 15:55:35 -04:00
James Turk	ef882a3040	tox	2015-05-28 14:17:15 -04:00