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

[Robert Scheck]

commit 534c3265aff33d9652a88c2016704e931067e82f
Merge: c7ee1cc 9039f13
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jul 31 23:12:45 2011 +0200

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

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