]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Thu, 31 May 2012 06:43:14 +0000 (08:43 +0200)
committerzottel <github@zottel.net>
Thu, 31 May 2012 06:43:14 +0000 (08:43 +0200)
commit20fdbda25e7fa1c1f6e234867df495be1085f3f8
tree6eb8a4448647f17357d5c5219ddc577f4948230d
parent24b58af68938558baa2ddc6809401ec528ff1176
parentf0cf0ebb485432b444b1d85843385ebfda0260fd
Merge remote branch 'upstream/master'