update email address
Merge pull request #422 from kyoshino/locale-ja

Update Japanese (ja) l10n
Commit from Mozilla Verbatim by user michael.koehler1@gmx.de.: 83 of 83 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user ouesten.: 83 of 83 strings translated (0 fuzzy).
Choose pay provider based on network (bug 987857)
Merge pull request #421 from kumar303/chooser

Choose pay provider based on network (bug 987857)
Commit from Mozilla Verbatim by user Mikk.: 83 of 83 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user markh@babelzilla.org.: 83 of 83 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user gialloporpora.: 83 of 83 strings translated (0 fuzzy).
Fix callback for Zippy

We should probably move Zippy over to provider/views.py
for server notifications but, meh. This fixes a mistake
in an earlier commit.
add in server notification (bug 991581)
Start a Boku transaction (bug 987907)
Merge pull request #423 from kumar303/boku

Start a Boku transaction (bug 987907)
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 83 of 83 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/webpay
Merge pull request #420 from andymckay/991581

some place holders for boku callbacks (bug 991581)
Commit from Mozilla Verbatim by user steekid.: 83 of 83 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/webpay
fix up mocks
Merge branch 'master' of github.com:mozilla/webpay