[GeoIP/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Philip Prindeville]

commit f6b97b73d75f578f30662c8cb1f3b17203e13be4
Merge: dd818b6 de8e655
Author: Philip A. Prindeville <philipp at redfish-solutions.com>
Date:   Fri Jun 7 21:40:08 2013 -0600

    Merge remote-tracking branch 'origin/master' into el6

 GeoIP.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---