Automatic merge with the upstream master branch

This commit is contained in:
Gustavo Cruz
2012-11-29 12:18:58 -04:00
144 changed files with 6902 additions and 2234 deletions

View File

@@ -24,8 +24,8 @@
*
*/
require_once ("classes/model/om/BaseOutputDocument.php");
require_once ("classes/model/Content.php");
//require_once ("classes/model/om/BaseOutputDocument.php");
//require_once ("classes/model/Content.php");
/**
* Skeleton subclass for representing a row from the 'OUTPUT_DOCUMENT' table.