4 Commits

Author SHA1 Message Date
Adi Sieker b5de5d9fc9 Merge branch 'master' into adi
Conflicts:
	AUTHORS
	convore/api.py
	convore/models.py
2011-05-17 23:33:55 +02:00
Cole Kowalski 77f4b3dfd5 add myself to the authors file 2011-03-29 20:38:17 -04:00
Adi Sieker a482303b15 added myself to the AUTHORS file. 2011-03-11 09:08:05 +01:00
Kenneth Reitz 814258e081 Added authors and manifest. 2011-02-21 13:40:31 -05:00