Automatic merge with the upstream master branch

2012-11-29 12:18:58 -04:00
parent f89014c14a 0cc58c934b
commit f55ff5bdae
144 changed files with 6902 additions and 2234 deletions
--- a/workflow/engine/classes/entities/FacetInterfaceResult.php
+++ b/workflow/engine/classes/entities/FacetInterfaceResult.php
@@ -1,5 +1,5 @@
 <?php
-require_once ('Base.php');
+//require_once ('Base.php');

 class Entity_FacetInterfaceResult extends Entity_Base
 {