OpenBazaar/OpenBazaar — pull request #355 by hoffmabc (2014-09-02 15:26:08+00:00)
Title: [WIP] Updating Shipping Address and Shipping Payment Totals

Conflicts:
html/partials/user.html