PIMCORE-2346 Error Adding an Objectbrick

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5047 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (3239) ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5048 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-2346 Error Adding an Objectbrick

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5049 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (3240) ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5050 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-2346 Error Adding an Objectbrick

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5051 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
PIMCORE-2354 - "Object with MetaData" is empty in Frontend if inheritance is activated

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5052 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (3241) ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5053 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Bugfix: Changed cache key for document texts (added asset id )

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5054 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (3242) ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5055 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Merge branch 'master' of github.com:pimcore/pimcore

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5056 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
fix imagick image adapter for older versions of imagick #96 : added braces

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5057 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Imagick bugfix vector graphics (SVG)

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5058 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
demo website: thumbnail test action

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5059 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
imagick adapter: auto progressive jpeg if filesize => 10k

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5060 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
image optimizer: set default to jpegoptim instead of imgmin

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5061 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
build auto version (3243) ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5062 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
ReAdded setter and getter for Colorspace

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5063 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
thumbnail config, added comment

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@5064 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Merge branch 'master' of https://github.com/pimcore/pimcore

Conflicts:
	pimcore/lib/Pimcore/Image/Adapter/Imagick.php