]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 20 Apr 2012 11:42:33 +0000 (13:42 +0200)
committerzottel <github@zottel.net>
Fri, 20 Apr 2012 11:42:33 +0000 (13:42 +0200)
commit9663299da1be50eef4327778fae619fc6f9edef4
tree5cd9b93f16c344cf896ac8d4e2a4a818fe21e783
parent041f74dc775424f686a1cd95c00e0d63bfc4b99c
parent0e25376e4afea4e5d96c233594feef0a35ca314c
Merge remote branch 'upstream/master'