Merge upstream, address conflict in src/utils/cmds/cmds_test.c
[collectd.git] / bindings /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - perl