2 commits

Author	SHA1	Message	Date
Ole Laursen	6a98fec2c3	Use built-in json module in Python instead of simplejson bundled with Django ... - Legacy-Id: 6883	2013-12-11 16:59:19 +00:00
Henrik Levkowetz	7e67b40a87	Merged in branch/amsl/trunkmerge@5449 from rcross@amsl.com, with some tweaks. This provides the secretariat apps. ... - Legacy-Id: 5482	2013-03-05 22:43:31 +00:00