Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 28 insertions, 0 deletions

diff --git a/classes/Group_member.php b/classes/Group_member.php
new file mode 100755
index 000000000..3c23a991f
--- /dev/null
+++ b/classes/Group_member.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Table Definition for group_member
+ */
+
+class Group_member extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'group_member';                    // table name
+    public $group_id;                        // int(4)  primary_key not_null
+    public $profile_id;                      // int(4)  primary_key not_null
+    public $is_admin;                        // tinyint(1)
+    public $created;                         // datetime()   not_null
+    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_member',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Group_member', $kv);
+    }
+}