Merge remote-tracking branch 'origin/master'

b709f814 · Daniel Schulte · 16e6444e · cd22fcf6 · b709f814 · b709f814
Commit b709f814 authored 10 years ago by Daniel Schulte
--- a/Installer-USB-Stick/Doku/screenshot/dia.jpg
+++ b/Installer-USB-Stick/Doku/screenshot/dia.jpg
--- a/Installer-USB-Stick/Doku/screenshot/gufw.jpg
+++ b/Installer-USB-Stick/Doku/screenshot/gufw.jpg
--- a/Installer-USB-Stick/Doku/screenshot/inkscape.jpg
+++ b/Installer-USB-Stick/Doku/screenshot/inkscape.jpg
--- a/Installer-USB-Stick/Doku/screenshot/pidgin.jpg
+++ b/Installer-USB-Stick/Doku/screenshot/pidgin.jpg
--- a/Installer-USB-Stick/Doku/screenshot/texstudio.jpg
+++ b/Installer-USB-Stick/Doku/screenshot/texstudio.jpg