Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2015-11-23 22:42:49 +01:00
2 changed files with 759 additions and 757 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff