Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 0 insertions, 10 deletions

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 2c9ad1d7..56c776aa 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -21,16 +21,6 @@ class ORM extends ORM_Core {
   // Track the original value of this ORM so that we can look it up in ORM::original()
   protected $original = null;
 
-  public function open_paren() {
-    $this->db->open_paren();
-    return $this;
-  }
-
-  public function close_paren() {
-    $this->db->close_paren();
-    return $this;
-  }
-
   public function save() {
     model_cache::clear();
     $result = parent::save();