Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
munin	munin: simplify setting of PERL5PATH	2014-07-18 12:37:36 +02:00
nagios	nagios: significant upgrades	2014-06-22 00:22:10 -05:00
net-snmp	net_snmp: update from 5.7.2 to 5.7.2.1, potentially fixes CVE-2014-2284, change source to .zip because tar.gz is broken	2014-03-26 13:43:51 +02:00
seyren	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
zabbix	zabbix: Update from 2.2.1 to 2.2.2	2014-02-13 18:34:01 +01:00