Problems with Auth.net payment hash check fix
Add update product stock quantity to order editor

Subtracts stock when inserting an order in the admin order editor. When
editing an order, add old order stock quantities (unless a missing
order) and then subtract new order quantities from product stock.
Merge pull request #173 from ADDCreative/patch25

Add update product stock quantity to order editor
session length change
Merge branch 'master' of https://github.com/opencart/opencart
Update upload/admin/view/template/common/header.tpl

ID must be unique
Merge pull request #176 from JFox-sk/patch-1

Update upload/admin/view/template/common/header.tpl
Correct spelling of Wairarapa (ref http://en.wikipedia.org/wiki/Wairarapa)
Merge pull request #181 from gurubobnz/master

Fix typo in New Zealand regions in initial database
[FIX] Only show downloads that you can download

Signed-off-by: Kayo Hamid <lab@kayohamid.net>
[FIX] Change that I forgot

Signed-off-by: Kayo Hamid <lab@kayohamid.net>
Fixed large file downloads

Removed headers not specified by RFC2616.
Turned off output buffering to fix issues with downloading large files.
Merge pull request #187 from bull5-i/master

Fixed large file downloads and removed non-standard headers
Merge pull request #185 from khflab/master

Only show downloads that I can download
fix for Bug in /catalog/model/affiliate/affiliate.php Line 51 in getAffiliateByEmail
Merge branch 'master' of https://github.com/opencart/opencart
When switching tabs, viewport jumping too high.
Merge pull request #205 from lusever/product-tabs-no-jump-scroll

On product page when switching tabs, viewport jumping too high.
Add jquery.total-storage.min.js to provide an integrated localStorage
and cookie solution.
Modfiy the 'display' .cookie calls to use .totalStorage
This makes the list/grid display option non-expiring and remembered from
session to session.
fix vertical align cart block in product page