[php-gettext/el6: 5/5] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit fea3ba2fd633c4ff15148c091a9ae00965902f21
Merge: f7f7011 9039f13
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 31 23:10:51 2011 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	php-gettext.spec
    	sources

 .gitignore       |    2 +-
 php-gettext.spec |   12 +++++++++---
 sources          |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)
---