Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php		2012-04-05 13:39:15 +02:00
..
alternate.png
blinklist.png
blogmarks.png
delicious.png
digg.png
magnolia.png
myweb2.png
newsvine.png
reddit.png
segnalo.png
simpy.png
spurl.png
technorati.png
wists.png