Merge branch 'master' into talmdal_dev

Conflicts: modules/gallery/helpers/items_rest.php
gallery · May 16, 2010 · b5b9aeb · b5b9aeb
2 parents 29a8ba9 + 83ce637
commit b5b9aeb
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
@@ -88,5 +88,4 @@ private static function format_restful_item($item) {
 
     return $item_rest;
   }
-
 }