]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 25 May 2012 19:05:42 +0000 (21:05 +0200)
committerzottel <github@zottel.net>
Fri, 25 May 2012 19:05:42 +0000 (21:05 +0200)
commit36d6018c110fca190b720c5ff27883c2d4ed70c3
tree93416482d64d3ad9f275986ce0d39c2024520d00
parent3aa516ccabc9bb09ae30ffa2d3657fba36699ea9
parentd1345e505406b1a1cdc3fc26a1734916c8abc89d
Merge remote branch 'upstream/master'