Commit c2dabdeed05c1517bf1020ba6b2aa2d9b1c75470

Werner Lemberg 2010-07-02T01:27:49

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