Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 14 Jun 2011 06:10:38 +0000 (08:10 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 14 Jun 2011 06:10:38 +0000 (08:10 +0200)
commitd08b068031f01e1bcf57a46b9e7dfcb217b6fb30
treefc700a19369cb7cc2d84966c042a6ef55db10983
parent4d3c6941cafb3b8a7e1d2ccccd5003a2dc468a4d
parent9b9bd35cba293b86c871c2cfbe15e6d9c4673a7d
Merge branch 'master' of git://github.com/friendika/friendika