Nico Schottelius 494b6cbbf9 Merge branch 'master' into 4.0-pre-not-stable		2014-12-11 17:13:52 +01:00
..
3.0	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00
niconext	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00
performance-ideas	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00
TAKEME	remove obsolete todos ... people believe they still need to be fixed!	2014-06-26 17:11:35 +02:00
tests	doc -> docs (pypi)	2012-10-25 17:17:52 +02:00