]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 21 Apr 2012 17:26:24 +0000 (19:26 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 21 Apr 2012 17:26:24 +0000 (19:26 +0200)
commit71e2dbf3522dcf076458805ee65dc976fb35a6f3
tree5c11d463eff15245458f5033d7d425671df8f1d0
parenta147d6113c081694d4209002fa5e57106d4c6f41
parentbdbe068b95e8c302179530dff7583997ff35f246
Merge commit 'upstream/master'