Michael DeHaan 152db00ed9 Merge remote branch 'origin' into devel ... Conflicts: library/web_infrastructure/django_manage		2013-06-16 22:15:30 -04:00
..
django_manage	Merge remote branch 'origin' into devel	2013-06-16 22:15:30 -04:00
supervisorctl	DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)	2013-06-15 20:54:25 +02:00