Check translations of email's subject/body when sending emails to dev about new regions (bug 902127)
removing testing file
testing round 2
Extract/compile script.  Today's lucky number is 4663.
Update to dev_phone.html template, to include new information on geeksphone, docs and tools, and contributing to the community.
Updated to Django 1.4.6 (bug 904708)
Merge branch 'master' into 902127-test-email-locale
Merge pull request #969 from davidbgk/902127-test-email-locale

Check translations of email's subject/body when sending emails to dev about new regions (bug 902127)
Add pre_update_latest_tag to fabfile
encrypt the oauth token (bug 848868)
Merge pull request #982 from andymckay/848868

encrypt the oauth token (bug 848868)
Revert "Merge pull request #982 from andymckay/848868"

This reverts commit 7e73feefc6d0bc58525a3daa05a42a87437550ca, reversing
changes made to 3e949326daa07b0c4873f185e79da2072ab08de8.
Add region/category/carrier filtering on Collections (bug 903489)

Also, implement dynamic filters fallback : if the current set of
filters don't return results, remove one and try again till we have
exausted available filters or we have found some results.

django-filter 0.7 upgrade is necessary to fix a bug regarding filtering
on '0' values.
Merge pull request #981 from diox/collections-region-category-carrier

Add region/category/carrier filtering on Collections (bug 903489)
Add "Author Name" to collections (bug 903168)
Merge pull request #997 from diox/collection-author

Add "Author Name" to collections (bug 903168)
Fix rocketfuel docs