irungentoo/ProjectTox-Core — pull request #660 by stqism (2013-11-21 10:44:48+00:00)
Title: Merges master changes in to harden, keeping harden sorta in sync is good, this is a reminder

Don't actually pull this until conflicts have been worked out.