Converted Doxygen to PHPDoc in eZContentObjectTrashNode
trashList returns an int when $asCount is set to true
EZP-20262 : fix include issue
eZSearch::removeObject() -> eZSearch::removeObjectById()
Fix EZP-19122: Faulty embed-inline handling
Merge pull request #664 from jeromegamez/deprecated_ezsearch_removeobject

Replaced calls to deprecated eZSearch::removeObject() with eZSearch::removeObjectById()
EZP-21128 Add injected-settings in ezpkerneltreemenu.php as in ezpkernelweb.php, for having back-office left treemenu.
Merge pull request #666 from Heliopsis-HQ/Add-injected-settings-in-ezpkerneltreemenu.php

EZP-21128 Missing injected-settings in ezpKernelTreemenu
Merge branch 'master' of github.com:ezsystems/ezpublish-legacy

* 'master' of github.com:ezsystems/ezpublish-legacy:
  EZP-21128 Add injected-settings in ezpkerneltreemenu.php as in ezpkernelweb.php, for having back-office left treemenu.
  Fix EZP-19122: Faulty embed-inline handling
  eZSearch::removeObject() -> eZSearch::removeObjectById()
EZP-20262 : no need to trigger autoload on second class_exists
The method originalParent() will never return an int
Merge pull request #658 from Tharkun/ezp-20262-include-issue

Fix EZP-20262: Classes override issue caused by includes
Merge pull request #647 from jeromegamez/phpdoc_ezcontenttrashnode

Converted Doxygen to PHPDoc in eZContentObjectTrashNode
Fix EZP-20949: Make sure parent is an object
This patch insures the parent was an object to avoid fatal errors if
the database is slighly corrupted.
Merge branch 'master' of github.com:ezsystems/ezpublish-legacy into CP_2013.6

* 'master' of github.com:ezsystems/ezpublish-legacy:
  Fix EZP-20949: Make sure parent is an object This patch insures the parent was an object to avoid fatal errors if the database is slighly corrupted.
  The method originalParent() will never return an int
  EZP-20262 : no need to trigger autoload on second class_exists
  EZP-21128 Add injected-settings in ezpkerneltreemenu.php as in ezpkernelweb.php, for having back-office left treemenu.
  Fix EZP-19122: Faulty embed-inline handling
  eZSearch::removeObject() -> eZSearch::removeObjectById()
  EZP-20262 : fix include issue
  trashList returns an int when $asCount is set to true
  Converted Doxygen to PHPDoc in eZContentObjectTrashNode
Merge branch 'master' into CP_2013.6

* master:
Patches to make the lagacy version work on the symlinked setups.