projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea0d5d3 c74f0f0)
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 28 Jul 2011 15:36:49 +0000 (17:36 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 28 Jul 2011 15:36:49 +0000 (17:36 +0200)

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