[php-pecl-geoip/el6: 9/9] Merge branch 'master' into el6

[topdog]

commit 2514fbdae769baa93eb94e6a506adcd4b8d8fd06
Merge: 4ad3731 baa0088
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sat Oct 20 17:47:22 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore          |    1 -
 geoip-build.patch   |   13 ++++++++
 geoip-tests.patch   |   25 ++++++++++++++++
 php-pecl-geoip.spec |   80 ++++++++++++++++++++++++++++++++++++++++-----------
 sources             |    2 +-
 5 files changed, 102 insertions(+), 19 deletions(-)
---