]> git.mxchange.org Git - friendica.git/commitdiff
Merge commit 'mike/master'
authorolivierm <olivier@migeot.org>
Wed, 23 Feb 2011 19:25:37 +0000 (20:25 +0100)
committerolivierm <olivier@migeot.org>
Wed, 23 Feb 2011 19:25:37 +0000 (20:25 +0100)

Trivial merge