Vladimír Čunát a2c316288c Merge master into stdenv-updates ... Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)		2014-01-12 12:29:24 +01:00
..
munin	Whitespace fixes in package expressions I maintain	2014-01-02 17:58:08 +01:00
nagios
net-snmp	net_snmp: fix build by autoreconfing	2014-01-05 11:19:07 +01:00
zabbix	Add meta.branch to some packages	2014-01-08 18:06:18 +02:00