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, 4 insertions, 2 deletions

diff --git a/classes/Profile_block.php b/classes/Profile_block.php
index 6ea26a3bc..551e690e2 100644
--- a/classes/Profile_block.php
+++ b/classes/Profile_block.php
@@ -36,12 +36,14 @@ class Profile_block extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
+    function staticGet($k,$v=null)
+    { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function get($blocker, $blocked) {
+    function get($blocker, $blocked)
+    {
         return Memcached_DataObject::pkeyGet('Profile_block',
                                              array('blocker' => $blocker,
                                                    'blocked' => $blocked));