Merge branch 'upstream'

Conflicts: README.md
coderholic · Feb 22, 2012 · a263890 · a263890
2 parents 83bc350 + 02fc747
commit a263890
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -71,6 +71,12 @@ Get region objects for US postal code:
     [<Region: Los Angeles County, California, United States>]
 ```
 
+Get a list of cities in the state of Texas:
+
+```python
+    City.objects.filter(country__name="United States", region__region_parent__name="Texas")
+```
+
  Install
 --------------------------
 - Run: `python setup.py install`