Commit 849bde1fa0296a107e597d2f8b57918d072e287c

Werner Lemberg 2011-05-30T07:29:04

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