Merge branch '0.8.x' into cmdline

diff --cc lib/common.php
Simple merge

diff --cc scripts/enjitqueuehandler.php
Simple merge

diff --cc scripts/facebookqueuehandler.php
Simple merge

diff --cc scripts/jabberqueuehandler.php
Simple merge

diff --cc scripts/maildaemon.php
Simple merge

diff --cc scripts/ombqueuehandler.php
Simple merge

diff --cc scripts/pingqueuehandler.php
Simple merge

diff --cc scripts/publicqueuehandler.php
Simple merge

diff --cc scripts/smsqueuehandler.php
Simple merge

diff --cc scripts/synctwitterfriends.php
Simple merge

diff --cc scripts/twitterqueuehandler.php
Simple merge

diff --cc scripts/twitterstatusfetcher.php
Simple merge

diff --cc scripts/xmppconfirmhandler.php
Simple merge

diff --cc scripts/xmppdaemon.php
Simple merge