]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 16 May 2012 06:24:46 +0000 (08:24 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 16 May 2012 06:24:46 +0000 (08:24 +0200)
commitf2c0c40f6e488f1a8e62bda9449b28115f343cac
treeae1418141f85be49b7d8cb3d2a0e8b2a7acc4eb4
parentf2e648d62fe7cafb9a55c7505687ea4d1c294778
parenta65bd73bf3f4a1e6ccfcdf0a06c70a4f1f4182ce
Merge remote branch 'upstream/master'