Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
quattro: fix item max-width, fix contact serarch autocomplete popup style
quattro: autocomplete private message To field
Merge pull request #623 from fabrixxm/master

IT strings update
Merge pull request #624 from fabrixxm/quattrofixs

Some fixs to Quattro theme
rev update
Merge https://github.com/friendica/friendica into pull
Merge branch 'master' of https://github.com/friendica/friendica
make sure conv_as->items is an array or don't proceed
admin option to disable post content in email notifications for the site
better description
some smarty templates needed updating
run limit_body_size on imported emails, which don't go through consume_feed
DE: update to the strings
Merge branch 'master' of https://github.com/friendica/friendica
Merge pull request #626 from fermionic/20130223-disable-content-in-notifications

admin option to disable content in email notifications
Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates

some smarty templates needed updating