]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 4 May 2012 18:42:14 +0000 (20:42 +0200)
committerzottel <github@zottel.net>
Fri, 4 May 2012 18:42:14 +0000 (20:42 +0200)
commitdedaa301cba5ca6c21af9ec54cc54a7f7480e2f4
treef71428787e701421068ce53e446bed47b7078fcf
parenta9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de
parent37d4181fde392b5d31d77531255b345d9a0e718b
Merge remote branch 'upstream/master'