Fixes Varien_Io_Sftp::write, Varien_Db_Adapter_Pdo_Mysql::insertOnDuplicate#110

Closed

thewunder wants to merge 5 commits into

magento:masterfrom

thewunder:master

Commits on Oct 29, 2012

Fix Varien_Io_Sftp::write uploading the file path rather than file contents
Michael O'Connell
committed

Commits on Nov 21, 2012

Merge branch 'master' of https://github.com/magento/magento2
Michael O'Connell
committed

Commits on Jan 10, 2013

Merge remote branch 'magento/master'
Michael O'Connell
committed

Commits on Apr 18, 2013

Merge branch 'master' of https://github.com/magento/magento2
Michael O'Connell
committed
fix issue with insertOnDuplicate where using a Mysql keyword as a column name can cause an SQL error
Michael O'Connell
committed