]> git.mxchange.org Git - friendica.git/commitdiff
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