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, 21 insertions, 0 deletions

diff --git a/classes/Related_group.php b/classes/Related_group.php
new file mode 100755
index 000000000..c00ad9c44
--- /dev/null
+++ b/classes/Related_group.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Table Definition for related_group
+ */
+
+class Related_group extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'related_group';                   // table name
+    public $group_id;                        // int(4)  primary_key not_null
+    public $related_group_id;                // int(4)  primary_key not_null
+    public $created;                         // datetime()   not_null
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Related_group',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+}