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)
commite072b3e9cc0188bf85912c95bb97d9b0de443915
tree4e9c6fde697aacc670121d5b06f7f7d7b9b8039b
parent25fa4ad93203289ec8d78e8d4b687acc3c05004a
parent43110388619862fa6861a510c13c42462e1eec0d
Merge remote-tracking branch 'origin/master'