Paulus Schoutsen b2cfce7243 Merge branch 'dev' into cleanup
Conflicts:
	.coveragerc
2015-08-05 06:51:39 -07:00
..
2015-07-23 22:15:17 +02:00
2015-05-10 23:49:09 +02:00
2015-07-07 00:01:46 -07:00