]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Sun, 20 May 2012 07:08:56 +0000 (09:08 +0200)
committerzottel <github@zottel.net>
Sun, 20 May 2012 07:08:56 +0000 (09:08 +0200)
commit2cd3ec7b983327f8c162845d0f4b8d9753f30e27
tree3eefeaf641e91416fa7b43b9a36b829f28ff1983
parent764ac240a9a9ffb7c855a69bc2f81e9d314a617f
parentf16a1199408d167bbc7c52dc408ef02b36808317
Merge remote branch 'upstream/master'