possibly fix  scrolling bug
Merge branch 'master' of https://github.com/JFreegman/toxic into groupbot
fix possible segfault
fix possible segfault
fix possible memory leak
Codec settings
Merge remote-tracking branch 'upstream/master'
Codec settings and MORE!
Merge pull request #119 from mannol1/master

Wow
implement basic user settings
Merge branch 'master' of https://github.com/Tox/toxic
settings_load needs to be before init_term
create empty config file if none found && make default time 24 hours
Update README.md
remove leading 0 and am/pm for 12 hour timestamp in chat windows
Merge branch 'master' of https://github.com/Tox/toxic
Include "pthread.h"

It isn't implicit on OpenBSD.
Drop typedef redeclarations

C99 doesn't permit redeclaring typedefs in the same scope.
Merge pull request #122 from czarkoff/redeclarations

Drop typedef redeclarations
Merge pull request #121 from czarkoff/openbsd

Include "pthread.h"