]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Wed, 23 May 2012 16:25:58 +0000 (18:25 +0200)
committerzottel <github@zottel.net>
Wed, 23 May 2012 16:25:58 +0000 (18:25 +0200)
commit3aa516ccabc9bb09ae30ffa2d3657fba36699ea9
tree93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f
parente9c86c0fd0fb87b49e60669e6d4be810ca426ec4
parent61dba985c14ebcfd20d18b579aee9b781f98bc23
Merge remote branch 'upstream/master'