Merge remote-tracking branch 'friendica/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Mon, 19 Mar 2012 11:28:41 +0000 (12:28 +0100)
committerFabio Comuni <fabrix.xm@gmail.com>
Mon, 19 Mar 2012 11:28:41 +0000 (12:28 +0100)

Trivial merge