Hash : 39746194 Author : Date : 2011-06-20T19:20:50
Merge branch 'master' of git.sv.gnu.org:/srv/git/freetype/freetype2 Conflicts: ChangeLog