https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0c659b bd2c8c9)
Merge remote-tracking branch 'upstream/master'
authorAlexander Kampmann <programmer@nurfuerspam.de>
Thu, 1 Mar 2012 10:49:22 +0000 (11:49 +0100)
committerAlexander Kampmann <programmer@nurfuerspam.de>
Thu, 1 Mar 2012 10:49:22 +0000 (11:49 +0100)

Trivial merge
mirror https://github.com/friendica/friendica.git