projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9c86c0 61dba98)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Wed, 23 May 2012 16:25:58 +0000 (18:25 +0200)
committerzottel <github@zottel.net>
Wed, 23 May 2012 16:25:58 +0000 (18:25 +0200)

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