projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf00e4d 048fcae)
Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Wed, 21 Dec 2011 16:37:35 +0000 (17:37 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Wed, 21 Dec 2011 16:37:35 +0000 (17:37 +0100)

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