Gina Häußge a564de25f6 Merge branch 'master-wave' of https://github.com/masterhou/OctoPrint into pr/masterhou/master-wave		2015-07-29 09:13:51 +02:00
..
octoprint	Merge branch 'master-wave' of https://github.com/masterhou/OctoPrint into pr/masterhou/master-wave	2015-07-29 09:13:51 +02:00
octoprint_setuptools	Re-added dependency_links option for create_plugin_setup_parameters	2015-07-22 22:10:31 +02:00