projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af48dbe a42b9ea)
Merge branch 'master' of git://github.com/friendika/friendika
authorroot <root@diekershoff.homeunix.net>
Wed, 8 Dec 2010 05:54:13 +0000 (06:54 +0100)
committerroot <root@diekershoff.homeunix.net>
Wed, 8 Dec 2010 05:54:13 +0000 (06:54 +0100)

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