Code

Merge branch 'fix-stringio-python2.7' of git://github.com/aelse/collectd