]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Tue, 29 May 2012 14:09:26 +0000 (16:09 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 29 May 2012 14:09:26 +0000 (16:09 +0200)
commit68757f25042b02624bfb748c25029023b3082f62
tree676489a112b4d972e1e5626a6dadfd604fc9ce7a
parenta08232fa955385b2eaff5f9094b39071fb1632ae
parent2eafa9a47519f9f35c5eb568cf4235c092c1dcce
Merge remote branch 'upstream/master'