]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Wed, 2 May 2012 06:11:52 +0000 (08:11 +0200)
committerzottel <github@zottel.net>
Wed, 2 May 2012 06:11:52 +0000 (08:11 +0200)
commit6000e7f30d1193dada903eaf0e6f44149a3dde33
tree9b9f482f611b6dd91866518387b79140c6567be7
parent2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177
parentbecdb1f5085f2561b8b0acebbdbf43e4a81d50da
Merge remote branch 'upstream/master'