projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5603cf d072481)
Merge branch 'master' of github.com:simonlnu/friendica
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 26 Jul 2012 17:52:38 +0000 (13:52 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 26 Jul 2012 17:52:38 +0000 (13:52 -0400)
* 'master' of github.com:simonlnu/friendica:


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