Nikolayya/pimcore — pull request #10 by Nikolayya (2012-11-12 20:55:53+00:00)
Title: merge Master

merge Master