projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 294577a 6da8402)
Merge remote branch 'mike/master'
authorOlivier Migeot <olivier@migeot.org>
Tue, 12 Apr 2011 11:55:43 +0000 (13:55 +0200)
committerOlivier Migeot <olivier@migeot.org>
Tue, 12 Apr 2011 11:55:43 +0000 (13:55 +0200)

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