projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df78c9b 283bc51)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Mon, 19 Mar 2012 08:34:39 +0000 (09:34 +0100)
committerzottel <github@zottel.net>
Mon, 19 Mar 2012 08:34:39 +0000 (09:34 +0100)

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