Merge branch 'pr/635' into dev

Conflicts:
	requirements_all.txt
This commit is contained in:
Paulus Schoutsen committed 2015-11-28 00:50:18 -08:00
commit bbfeba0fe4
8 files changed
+475 -3

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB