projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dedaa30 62ea913)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Fri, 4 May 2012 22:54:00 +0000 (00:54 +0200)
committerzottel <github@zottel.net>
Fri, 4 May 2012 22:54:00 +0000 (00:54 +0200)

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