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

@@ -1,7 +1,7 @@
<?php
require_once 'classes/model/om/BaseAppSolrQueue.php';
require_once 'classes/entities/AppSolrQueue.php';
//require_once 'classes/model/om/BaseAppSolrQueue.php';
//require_once 'classes/entities/AppSolrQueue.php';
/**
* Skeleton subclass for representing a row from the 'APP_SOLR_QUEUE' table.