Merge branch '2015.11' into 2015.11-develop
[tine20] / docs / screenshots / Voipmanager /
drwxr-xr-x   ..
-rw-r--r-- 93456 de_edit_snomphone.png