2 commits

Author	SHA1	Message	Date
Laurent Bachelier	a6fbcbaec7	Reconcile the two previous commits (json/to_dict) ... Also fix some to_dict move things that were incomplete. And some PEP8 fixes. closes #1060 closes #1061	2013-03-09 15:14:17 +01:00
Julien Hebert	8d8fe9090f	json encoder	2013-03-09 14:57:08 +01:00