Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2016-05-22 13:13:04 +02:00
27 changed files with 1186 additions and 925 deletions

File diff suppressed because it is too large Load Diff