Merge commit 'laconica/0.8.x' into 0.9.x

diff --cc install.php
Simple merge

diff --cc lib/common.php
Simple merge

diff --cc lib/facebookaction.php
Simple merge

diff --cc lib/util.php
Simple merge