Merge remote-tracking branch 'github/pr/404'
authorFlorian Forster <octo@collectd.org>
Fri, 16 Aug 2013 09:26:27 +0000 (11:26 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 16 Aug 2013 09:26:27 +0000 (11:26 +0200)
commitebfc24ca56e086eb6761602f8323758455294c15
treede90e7b3383dae9f21f13587eaf771c9d8cf792a
parent06af7097ff0c9f97667774ab658e560f0950a23f
parentcdde2ef49eb82463a2166e6433722e902823399c
Merge remote-tracking branch 'github/pr/404'