Adding some category, instead of "other"
Merge branch 'plugin/category' of https://github.com/munin-monitoring/contrib
Merge branch 'master' of https://github.com/munin-monitoring/contrib

Conflicts:
	plugins/acy/yacy
	plugins/ail/clamav
	plugins/ail/courier_log
	plugins/ail/mail_connections
	plugins/ail/postfix_stats
	plugins/ail/qremote
	plugins/ail/queuestats
	plugins/ames/b3error_
	plugins/apache/apache_average_time_last_n_requests
	plugins/cpan/cpanp_o
	plugins/etwork/http_status
	plugins/etwork/tg585v7__
	plugins/etwork/zenus_
	plugins/etworker/nsr_device_writing
	plugins/games/b3error_
	plugins/groupwise/snmp__gwia_msgs_
	plugins/groupwise/snmp__gwmta_msgs_
	plugins/hp2600/hp2600_count_
	plugins/hp2600/hp2600_status_
	plugins/iki/moinoin_pages
	plugins/java/jvm_sun_memory
	plugins/java/jvm_sun_minorgcs
	plugins/java/jvm_sun_tenuredgcs
	plugins/jvm/jvm_sun_memory
	plugins/jvm/jvm_sun_minorgcs
	plugins/jvm/jvm_sun_tenuredgcs
	plugins/kvm/kvm_cpu
	plugins/kvm/kvm_io
	plugins/kvm/kvm_mem
	plugins/kvm/kvm_net
	plugins/mail/clamav
	plugins/mail/courier_log
	plugins/mail/mail_connections
	plugins/mail/postfix_stats
	plugins/mail/qremote
	plugins/mail/queuestats
	plugins/mysql/mysql-schema-size
	plugins/mysql/mysql-table-size
	plugins/mysql_schema_size_/mysql-schema-size
	plugins/mysql_table_size_/mysql-table-size
	plugins/network/http_status
	plugins/network/network-usage
	plugins/network/tg585v7__
	plugins/network/zenus_
	plugins/networker/nsr_device_writing
	plugins/nginx/ngnix_memory
	plugins/ope/zope_conflict_errors
	plugins/openldap/slapd_
	plugins/openldap/slapd_bdb_cache_
	plugins/openvz/openvz-load-average
	plugins/ostgresql/postgres_block_read_
	plugins/ostgresql/postgres_locks
	plugins/ostgresql/postgres_queries2_
	plugins/ostgresql/postgres_space_
	plugins/ostgresql/slony_
	plugins/other/apache_average_time_last_n_requests
	plugins/other/b3error_
	plugins/other/clamav
	plugins/other/courier_log
	plugins/other/cpanp_o
	plugins/other/hp2600_count_
	plugins/other/hp2600_status_
	plugins/other/http_status
	plugins/other/jvm_sun_memory
	plugins/other/jvm_sun_minorgcs
	plugins/other/jvm_sun_tenuredgcs
	plugins/other/kvm_cpu
	plugins/other/kvm_io
	plugins/other/kvm_mem
	plugins/other/kvm_net
	plugins/other/mail_connections
	plugins/other/moinoin_pages
	plugins/other/mysql-schema-size
	plugins/other/mysql-table-size
	plugins/other/nsr_device_writing
	plugins/other/postfix_stats
	plugins/other/postgres_block_read_
	plugins/other/postgres_locks
	plugins/other/postgres_queries2_
	plugins/other/postgres_space_
	plugins/other/pureftpd_traffic
	plugins/other/qpsmtpd_mailstats
	plugins/other/qremote
	plugins/other/queuestats
	plugins/other/slapd_
	plugins/other/slapd_bdb_cache_
	plugins/other/slony_
	plugins/other/snmp__gwia_msgs_
	plugins/other/snmp__gwmta_msgs_
	plugins/other/tg585v7__
	plugins/other/uptime
	plugins/other/yacy
	plugins/other/zenus_
	plugins/other/zope_conflict_errors
	plugins/p2600/hp2600_count_
	plugins/p2600/hp2600_status_
	plugins/pache/apache_average_time_last_n_requests
	plugins/pan/cpanp_o
	plugins/penldap/slapd_
	plugins/penldap/slapd_bdb_cache_
	plugins/postgresql/postgres_block_read_
	plugins/postgresql/postgres_locks
	plugins/postgresql/postgres_queries2_
	plugins/postgresql/postgres_space_
	plugins/postgresql/slony_
	plugins/psmtpd/qpsmtpd_mailstats
	plugins/pureftpd/pureftpd_traffic
	plugins/qpsmtpd/qpsmtpd_mailstats
	plugins/roupwise/snmp__gwia_msgs_
	plugins/roupwise/snmp__gwmta_msgs_
	plugins/system/uptime
	plugins/tor/tor-bandwidth-usage
	plugins/ureftpd/pureftpd_traffic
	plugins/vm/kvm_cpu
	plugins/vm/kvm_io
	plugins/vm/kvm_mem
	plugins/vm/kvm_net
	plugins/wiki/moinoin_pages
	plugins/yacy/yacy
	plugins/ystem/uptime
	plugins/zope/zope_conflict_errors
Merge branch 'master' of github.com:claudius23/contrib

Conflicts:
	plugins/graph_category/snmp__gwia_bytes_
	plugins/graph_category/snmp__gwpoa_
	plugins/other/snmp__gwia_bytes_
	plugins/other/snmp__gwpoa_
	plugins/snmp/snmp__gwia_bytes_
	plugins/snmp/snmp__gwpoa_