]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Sun, 3 Jun 2012 12:21:51 +0000 (14:21 +0200)
committerzottel <github@zottel.net>
Sun, 3 Jun 2012 12:21:51 +0000 (14:21 +0200)
commit70c4ab68754941749a5e89434d6db19f6bba1e16
tree525a6536b6ab7f9020e83daf9287c785303ad584
parentdf2fdf08ddf8cb354022992d4353ced4295b77b3
parentdaa4f5213f726b22846859f2f12d06889e9bdc9b
Merge remote branch 'upstream/master'