Merge remote-tracking branch 'origin/master'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:26 +0000 (12:41 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:26 +0000 (12:41 +0100)

Trivial merge