]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cce69f0 e11b51a)
Merge remote branch 'upstream/master'
authorMichael <icarus@dabo.de>
Mon, 27 Feb 2012 23:03:49 +0000 (00:03 +0100)
committerMichael <icarus@dabo.de>
Mon, 27 Feb 2012 23:03:49 +0000 (00:03 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.