repeated line

repeated $this->data['text_discount'] = $this->language->get('text_discount');
Update tracking.tpl
more work done on the file manager. i think close to finishing.
updated to the font-awesome 4.0
caned al the class attributes form icon to fa to match fortawesome syntax
more fortawesome work done
more fortawesome update
corrected wrong charset definition
updated tot he latest ckeditor
ckeditor full version update
Make email address clickable in order-info
Merge pull request #964 from 4levels/master

corrected wrong charset definition
Merge pull request #933 from pixelcreativ/patch-1

Update tracking.tpl
Merge pull request #927 from MarketInSG/patch-1

repeated line
Merge pull request #965 from SamStonehouse/patch-1

Make email address clickable in order-info
more file manager work done
Merge branch 'master' of https://github.com/opencart/opencart
Removed single quote mark from mysqli driver file when setting charset - fix from recent merge. Ref #964
more work on the file manager done
Merge branch 'master' of https://github.com/opencart/opencart