Merge remote-tracking branch 'upstream/master'
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.
add phpdoc
more phpdocs
Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself
Remove debug line added by mistake
Merge pull request #657 from mexon/cron_lock

Add separate lock file for cronhooks, which might also take a long time ...
Merge pull request #656 from fabrixxm/master

phpdocs for include/text.php
Merge remote-tracking branch 'upstream/master'
Undo some code formatting touchups
DE: update to the strings
vier: The background color of the right area is now white.
Merge pull request #658 from annando/master

Mail importing problems, a small "vier" change
Make the content type available after calling fetch_url
Merge remote-tracking branch 'upstream/master'