Add 2 new manual A1 substitutions.
Update to the July 2013 GeoIP database.
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Merge remote-tracking branch 'origin/maint-0.2.4'
Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'