Merge remote-tracking branch 'rosetta/master'
clear
Merge remote-tracking branch 'rosetta/master'
Updated to current Merchello development (not released) version 1.2.12
Merge pull request #30 from rustyswayne/master

Updated to current Merchello development (not released) version 1.2.12