Merge branch 'master' into conflictingFontFix
authorDominik Röttsches <d-r@roettsches.de>
Tue, 28 Jun 2016 07:52:18 +0000 (09:52 +0200)
committerGitHub <noreply@github.com>
Tue, 28 Jun 2016 07:52:18 +0000 (09:52 +0200)
commit7aa3631dd06af74a1fa9f0bfaa5f721876be817f
tree18de38a8dac4f3666aa48ee92b5ff8f832a22e6e
parentf7da0486ed8884481d477ce08fcf928c4da9a0a3
parentabae93faef32562f34a72981d252c848cc4f7565
Merge branch 'master' into conflictingFontFix