3 commits

Author	SHA1	Message	Date
j	02e86d27aa	dont import defaults.json	2014-09-24 12:44:25 +02:00
j	9b63c03ceb	load defaults from defaults.json if it exists	2014-09-19 11:57:11 +02:00
j	0cbc44bd5e	pandor_incoming	2013-10-28 21:42:10 +01:00