]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 1 Jun 2012 06:31:38 +0000 (08:31 +0200)
committerzottel <github@zottel.net>
Fri, 1 Jun 2012 06:31:38 +0000 (08:31 +0200)
commit08b335cac0a881b8f19793aaaebc6dacef445643
tree46b41c1f463ab90588f109105c95e85dad8fd432
parent20fdbda25e7fa1c1f6e234867df495be1085f3f8
parent93bc29a711637c84a4ffc380078277de89af4e6d
Merge remote branch 'upstream/master'