Merge https://github.com/stqism/ProjectTox-Core
added ability to close and reopen chat windows & other minor changes
test
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing
init array
Merge remote-tracking branch 'upstream/master' into testing
chat window deleting and re-adding - it just werks
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core
list commands on chat window popup
bug fix and added wrapping on friends list
spacing didn't match outgoing msgs
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core
On UNIX, if pkg-config is available, use it to find the location of
libconfig's headers.

	modified:   cmake/FindLIBCONFIG.cmake
Merge pull request #353 from cjsthompson/master

On UNIX, if pkg-config is available, use it to find the location of libconfig's headers.
Stops line-spamming and clears before printing help

This addresses one issue in #340 perfectly and slightly improves the other.
Corrected wrap-around

This should allow wrap-around and allow proper execution.
Update prompt.c
Fixed formatting
Merge pull request #354 from Nominate/patch-4

Stops line-spamming and clears before printing help
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master

Conflicts:
	testing/toxic/prompt.c