Merge branch 'master' of git@github.com:rapidsms/rapidsms into rapidsms-main
removing the modelrelationship app
Merge branch 'master' of git@github.com:rapidsms/rapidsms
Merge branch 'master' of git://github.com/rapidsms/rapidsms

Conflicts:
	apps/httptester/admin.py
	apps/httptester/app.py
	apps/httptester/forms.py
	apps/httptester/views.py
	apps/webapp/templates/layout.html
	rapidsms
Merge branch 'master' of git://github.com/rapidsms/rapidsms

Conflicts:
	apps/httptester/admin.py
	apps/httptester/app.py
	apps/httptester/forms.py
	apps/httptester/views.py
	apps/webapp/templates/layout.html
	rapidsms
removing the modelrelationship app
(cherry picked from commit bc12640bee47a6f41d44cf20c5f873355a5076bd)
Merge branch 'master' of git://github.com/dimagidan/rapidsms into dan

Conflicts:
	apps/modelrelationship/admin.py
	apps/modelrelationship/tests/basic.py
Merge branch 'master' of git://github.com/dimagidan/rapidsms into dan

Conflicts:
	apps/modelrelationship/admin.py
	apps/modelrelationship/tests/basic.py
Fixing the login/loggedout screens to be compatible with the new
templating system.
Fixing the login/loggedout screens to be compatible with the new
templating system.
Fixing the views for the polls app, which were not compatible with the
new templating scheme.
Fixing the login/loggedout screens to be compatible with the new
templating system.
(cherry picked from commit 8503bc9409a68ed1fbf98bbbd477af75d3afddb2)
Fixing the login/loggedout screens to be compatible with the new
templating system.
(cherry picked from commit 8503bc9409a68ed1fbf98bbbd477af75d3afddb2)
Fixing the views for the polls app, which were not compatible with the
new templating scheme.
(cherry picked from commit 6a64600fa7bb020a70a59bbc524cd4457055f501)
Merge branch 'master' of git@github.com:rapidsms/rapidsms into dan
Improved error reporting for unicode errors on unit tests
added "filter" phase to incoming messages

returning True during the filter phase short-circuits the entire
incoming message, unlike the handle phase, which just short-circuits
it's own phase.

this isn't very well thought out. i'm just giving it a go to sort out
some duplicate incoming messages. don't pull to core.
added "filter" phase to incoming messages

returning True during the filter phase short-circuits the entire
incoming message, unlike the handle phase, which just short-circuits
it's own phase.

this isn't very well thought out. i'm just giving it a go to sort out
some duplicate incoming messages. don't pull to core.
Changed pagination so that it doesn't show a bazillion pages
Changed pagination so that it doesn't show a bazillion pages