projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a810d2a ad3d2bd)
Merge branch 'pull'
authorFriendika <info@friendika.com>
Mon, 19 Sep 2011 23:40:14 +0000 (16:40 -0700)
committerFriendika <info@friendika.com>
Mon, 19 Sep 2011 23:40:14 +0000 (16:40 -0700)

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