Codec settings
Merge remote-tracking branch 'upstream/master'
Codec settings and MORE!
Merge pull request #119 from mannol1/master

Wow
Merge branch 'master' of https://github.com/Tox/toxic