[packages/crossmingw32-harfbuzz: 2/2] Merge branch 'master' of git://git.pld-linux.org/packages/crossmingw32-harfbuzz

[qboosh]

commit 831e58ac992f916992f2868cf76622f6f7c527b0
Merge: 648455c 16d7336
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 20 12:56:48 2013 +0200

    Merge branch 'master' of git://git.pld-linux.org/packages/crossmingw32-harfbuzz
    
    Conflicts:
    	crossmingw32-harfbuzz.spec

 crossmingw32-harfbuzz.spec | 1 +
 1 file changed, 1 insertion(+)
---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-harfbuzz.git/commitdiff/831e58ac992f916992f2868cf76622f6f7c527b0