Fixed template errors in trash.tpl
Fixed: one too many </div>
Merge pull request #473 from pedroresende/EZP-19851

Fixed issue EZP-19851 - The footer div is inside of columns div in the webshop
Fixed a display issue when the trash is empty
Add phpdoc on eZSearch:getEngine()
suppression unfinished
Merge pull request #476 from npanau/french_translation

"unfinished" removed to reach 100% - 2012.10/5.0 translation session
Merge branch 'ezp-19830_ezmultiupload_session'
Fixed EZP-19876: Changing Class's attribute order mixes attributes when we use a already existing order number
Fix EZP-19650: move to trash and trashpurge.php can hit the memory limit
Fix EZP-19834: Fatal error if the object is removed before running workflow cronjob
Merge commit '6b6af15'
Update kernel/classes/datatypes/ezxmltext/ezxmlinputparser.php

`$convertedText` is never instantiated nor is it ever used. Update comments out the variable to prevent unintended errors.
Move the comment to the line above the variable.

Moves the comment so that the variable can be safeley/independantly
uncommented.
Fix EZP-19830: ezmultiupload is broken if used through the Symfony stack

Fixed a regression introduced in the fix of EZP-19830
Fix EZP-19707: Unable to align an embed image
Fix EZP-19832: IE8 Not aligning correctly the text
Fixed EZP-19904 Admin interface redirection to raw treemenu JSON output

Also fixes EZP-19841
array_unique() on 2-dimensional array produces PHP notices

When accessing /content/history/<node_id> with PHP Notices display enabled, an error Array to string conversion is shown for each displayed version.

This is because of the usage of array_unique() which is not intended to be used on multi-dimensional array (see http://php.net/array_unique in the "Notes" section).

This fix uses the approach proposed at http://stackoverflow.com/a/946300/284325 to enable the wanted behaviour for the versionArray
Added SORT_REGULAR flag to array_unique()