From: Mike Macgirvin Date: Sun, 11 Jul 2010 11:33:51 +0000 (-0700) Subject: Merge branch 'master' of /home/macgirvin/mike.macgirvin.com/../dfrn/dev X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ff57833d02fd41dbc3f167322d752300c0a1fb48;p=friendica.git Merge branch 'master' of /home/macgirvin/mike.macgirvin.com/../dfrn/dev --- ff57833d02fd41dbc3f167322d752300c0a1fb48