| commit | f7da0486ed8884481d477ce08fcf928c4da9a0a3 | [log] [tgz] |
|---|---|---|
| author | Dominik Röttsches <d-r@roettsches.de> | Mon Jun 20 10:25:43 2016 +0300 |
| committer | GitHub <noreply@github.com> | Mon Jun 20 10:25:43 2016 +0300 |
| tree | 14b060a1a451984dd0809aff3cb01190177a3c97 | |
| parent | a0223274b97e82fe02730fd45729172511fec459 [diff] | |
| parent | 07461d06d242cd5cfda7ccb891189f074a89b460 [diff] |
Merge branch 'master' into conflictingFontFix