]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote branch 'mike/master'
authorOlivier Migeot <olivier@migeot.org>
Mon, 28 Mar 2011 10:11:10 +0000 (12:11 +0200)
committerOlivier Migeot <olivier@migeot.org>
Mon, 28 Mar 2011 10:11:10 +0000 (12:11 +0200)

Trivial merge