projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6f5e5b 7c19689)
Merge branch 'master' of http://github.com/friendika/Free-Friendika
authorDevlon Duthie <duthied@gmail.com>
Sun, 2 Oct 2011 23:39:53 +0000 (18:39 -0500)
committerDevlon Duthie <duthied@gmail.com>
Sun, 2 Oct 2011 23:39:53 +0000 (18:39 -0500)

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