From: friendica <info@friendica.com>
Date: Fri, 2 Mar 2012 02:54:50 +0000 (-0800)
Subject: Merge branch 'pull'
X-Git-Tag: 2.38~50
X-Git-Url: https://reisub.nsupdate.info/git/?a=commitdiff_plain;h=8207272fbc9cdc76988a2848552528e28951fe27;p=friendica.git%2F.git

Merge branch 'pull'
---

8207272fbc9cdc76988a2848552528e28951fe27