projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f4d3bf 2f98de1)
Merge branch 'pull'
authorFriendika <info@friendika.com>
Sun, 9 Oct 2011 22:50:49 +0000 (15:50 -0700)
committerFriendika <info@friendika.com>
Sun, 9 Oct 2011 22:50:49 +0000 (15:50 -0700)

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