]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sat, 14 Apr 2012 11:15:25 +0000 (13:15 +0200)
committerMichael Vogel <icarus@dabo.de>
Sat, 14 Apr 2012 11:15:25 +0000 (13:15 +0200)
commit4e220ec391514fbdeaa7d64abfd1752a9b44bbaa
tree1cb3cb621221e948be9e0e91916aac0dd6fccb0e
parent572678fef95816deaa1ecafe5cbcfb8cc65963c9
parent0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e
Merge commit 'upstream/master'