Commit a8dbf7dbbcdf72cda8f17393817bbd722a358322

Werner Lemberg 2011-04-21T08:25:14

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