projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e07525 f632a4a)
Merge branch 'master' of git://github.com/friendika/friendika
authorroot <root@diekershoff.homeunix.net>
Thu, 30 Dec 2010 06:58:18 +0000 (07:58 +0100)
committerroot <root@diekershoff.homeunix.net>
Thu, 30 Dec 2010 06:58:18 +0000 (07:58 +0100)

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