Ray Gauss 8364f184fc Merged BRANCHES/DEV/HEAD-QA to HEAD:
49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
        49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX:
             49111: - Revert of r47645
                    - Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD
                    - Relates to ALF-5051 and MNT-8599 / ALF-18726
        49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984
   49979: ALF-18726: Alfresco could not start with WCMQS applied
        - Updated RenditionServiceIntegrationTest with new imgpreview values


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-05-13 13:44:30 +00:00
..
2013-05-13 13:44:30 +00:00