Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Mon, 20 Jan 2014 16:56:00 +0000 (17:56 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 20 Jan 2014 16:56:00 +0000 (17:56 +0100)
commit9b9a04b4e7e8481b7375d5c5d11ab5b813165f14
tree0db18fa4ae83a54deae00be6e8457672b3e4ae33
parenta8957d22be4d5964c2bdfb6e664ce657cc107ebf
parentca8b50eff1e9341159416c8b53f2d1d11b99591b
Merge remote-tracking branch 'github/master'