Merge branch 'master' of git://github.com/friendika/friendika
authorroot <root@diekershoff.homeunix.net>
Sun, 12 Dec 2010 09:34:34 +0000 (10:34 +0100)
committerroot <root@diekershoff.homeunix.net>
Sun, 12 Dec 2010 09:34:34 +0000 (10:34 +0100)
commit2e9dca7c9f0e50956723505ad576bf32e762d11e
treedbe956c31285682bc620ccb7c5f03f2e3785c6e7
parent037cd5d80993dedfccfe9ef25679c54297ef1546
parenta50343830f87966b5857be295633d8dff576931a
Merge branch 'master' of git://github.com/friendika/friendika