Gina Häußge 3ebf5e5240 Merge branch 'devel' into dev/pluginLifecycleMgmt ... Conflicts: src/octoprint/plugin/core.py		2015-04-01 11:02:05 +02:00
..
octoprint	Merge branch 'devel' into dev/pluginLifecycleMgmt	2015-04-01 11:02:05 +02:00