Code

Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Mon, 16 Dec 2013 16:17:55 +0000 (17:17 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 16 Dec 2013 16:17:55 +0000 (17:17 +0100)
commitb19aa60c32f4792f8e16f90af22166c185540702
treef1b675c4e166d7759944bec20afd04a89978cfe7
parenta321fd49b6e74ffddd67e9c5b44b4d6ce3a8bbe8
parent1663ae3de60be5cc1dd641c14b36d351dfdce35e
Merge remote-tracking branch 'github/master'