projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cd3ec7 02502c3)
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Tue, 22 May 2012 06:46:02 +0000 (08:46 +0200)
committerzottel <github@zottel.net>
Tue, 22 May 2012 06:46:02 +0000 (08:46 +0200)

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