Gina Häußge e28ca60f21 Merge branch 'maintenance' into devel ... Conflicts: CHANGELOG.md		2016-02-10 16:46:56 +01:00
..
filemanager
plugin
printer
slicing
static/js
timelapse
users
util
test_daemon.py