Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Mon, 14 Nov 2011 09:51:58 +0000 (10:51 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Mon, 14 Nov 2011 09:51:58 +0000 (10:51 +0100)

Trivial merge