Merge branch 'master' into conflictingFontFix
authorDominik Röttsches <d-r@roettsches.de>
Wed, 29 Jun 2016 10:10:41 +0000 (12:10 +0200)
committerGitHub <noreply@github.com>
Wed, 29 Jun 2016 10:10:41 +0000 (12:10 +0200)
commit1bea49eb4b7a94ab6222f9c3c40320cbdb247b2d
tree55697e178f433cec8565a5e2cb52ce812251b735
parent7aa3631dd06af74a1fa9f0bfaa5f721876be817f
parent70e72e5f61d73c33d3c8f3bf07f5a9afd0db046a
Merge branch 'master' into conflictingFontFix