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