Code

Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Fri, 16 Aug 2013 09:27:25 +0000 (11:27 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 16 Aug 2013 09:27:25 +0000 (11:27 +0200)
commitc7b21ea4befed851564f38140cfcd06a806e1050
treefe1e6fcc850d71613f9110ac64c34bce8ccd887c
parentebfc24ca56e086eb6761602f8323758455294c15
parent14de2fea1780619c2cdd641ac0c2fa825a7e8dc3
Merge remote-tracking branch 'github/master'