Commit 397461947ca6b70e31344c52854da9e8163664bb

Werner Lemberg 2011-06-20T19:20:50

Merge branch 'master' of git.sv.gnu.org:/srv/git/freetype/freetype2 Conflicts: ChangeLog