Bug 804293 - Fixing a persistent notice that appears when GEOIP =
FALSE. This will help clean up the logs in production and make it
easier to see actual problems as they are happening.
Bug 809229, show ssl_only in product listing UI
Preparing the code to be more easily unit testing in accordance with
our choice to unit test Bouncer. The following tasks were completed:

* Changing functions to be in a separate file to facilitate testing.
* Passing the SDO object directly into functions to facilitate the
  creation of a mock SDO object to uncouple Bouncer from a database
  during testing.
* The implementation of a recursive, stand-alone function for the
  querying of mirrors in the database, to facilitate testing this
  important functionality.
Bug 777516, Adjust sql definition for changing sentry_log.reason to mediumtext
Adding Jake Maul's patch to reduce overall server load by letting Zeus cache for a short period.
increasing UA timeout from 5s to 10s... helps prevent accidental disabling
deactivate_sth doesn't exist, should be update_sth
missing log line for 403/404 failure codes
Merge pull request #21 from brandonsavage/bug804293

Bug 804293 - Fixing a persistent notice that appears when GEOIP =
Upgrading the SimpleTest library. Adding a mock object and new
tests. Precursor to actual database tests.

.
Merge branch 'master' of github.com:mozilla/tuxedo into bouncer-tests

Conflicts:
	bouncer/php/index.php
Merge pull request #24 from brandonsavage/bouncer-tests

Bouncer tests
Merge pull request #23 from nthomas-mozilla/sentry-sql

Bug 777516, Adjust sql definition for changing sentry_log.reason to mediumtext
Merge pull request #22 from nthomas-mozilla/ssl-only

Bug 809229, show ssl_only in product listing UI
Reinstating the cache changes.