[SDL_ttf/el6: 13/13] Merge branch 'master' into el6

[Moez Roy]

commit c3d013b009654a04aff0aaeed074e585b56ad287
Merge: e3870a3 c64db88
Author: Moez Roy <moez.roy at gmail.com>
Date:   Thu Nov 27 07:08:44 2014 -0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore   |    2 ++
 SDL_ttf.spec |   32 ++++++++++++++++++++++++++++++--
 sources      |    2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)
---