4 commits

Author	SHA1	Message	Date
makefu	9c12d3af80	Merge branch 'master' of pnp:stockholm	2015-10-28 22:07:51 +01:00
makefu	74edacb138	m 2 sources: add system tag	2015-10-28 15:09:31 +01:00
makefu	9749d9ff0d	m 12 collectd: wry uses cherry-picked collectd to enable python support	2015-10-27 18:12:05 +01:00
makefu	96ed20e15d	m 2 unstable-sources: sources to unstable nixpkgs	2015-10-21 18:45:32 +02:00