Merge branch 'master' of ssh://git.sv.nongnu.org/srv/git/freetype/freetype2 Conflicts: src/truetype/ttinterp.c
2012-12-16T20:02:42