Bug 778974: Add affiliates mailing list.
Merge pull request #6 from Osmose/affiliates-list

Bug 778974: Add affiliates mailing list.
Gogo emergency late night fix!

It appears that as part of the SMS changes the user method
accidentally got marked as requiring POST, when in fact
it is intended to be used as either POST or GET depending
on if you're updating a user or not.
Add id and ru newsletter to the list of newsletters with double confirmation on signup

(a couple of EOL whitespaces removed too)

fix bug 788473
Fix bug 794541: Import missing SET variable.

I totally missed importing this when I restored the old
user POST code. Whoops!
Add test for user view.
Merge pull request #8 from Osmose/fix-missing-set-import

Fix bug 794541: Import missing SET variable.
Bug 818568: Add token to return for ET calls.

* Move uuid creation to token field default.
Merge pull request #10 from pmclanahan/bug-818568-return-token-on-sub

Bug 818568: Add token to return for ET calls.
Bug 811808: Add endpoint for populating phonebook data ext.
Merge pull request #12 from pmclanahan/bug-811808-more-dataextension-data

Bug 811808: Add endpoint for populating phonebook data ext.
Bug 826292: Add Firefox OS newsletter.
Add data from basket DB to debug-user method.

This will be useful when we have bugs (like bug 831469)
that result from token mismatch between ExactTarget and
basket.
Merge pull request #13 from pmclanahan/add-more-to-debug-user

Add data from basket DB to debug-user method.
[Bug 829279] Add Firefox Flicks newsletter
Merge pull request #14 from Sancus/master

[Bug 829279] Add Firefox Flicks newsletter
Bug 836106: Ensure basket data is in sync with ET.

Fix issue with 500 errors on ET errors.
Bring README.rst up to date

Update some commands that were no longer accurate.
Bug 843103: Upgrade to latest basket-lib, which has upgraded Django.
Merge pull request #19 from pmclanahan/bug-843103-upgrade-django

Bug 843103: Upgrade to latest basket-lib, which has upgraded Django.