PSRing
Merge branch 'master' of github.com:AIWebSystems/GeoCode

Conflicts:
	src/Pyro/FieldType/Geocode.php