stockholm - take all the computers hostage, they'll love you!

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'tv'	lassulus	2015-08-24	6	-13/+16
\|\
\| *	tv git: allow secret collaborateurs	tv	2015-08-24	1	-6/+6
\| *	tv urlwatch: +exim	tv	2015-08-20	1	-0/+2
\| *	{cd,nomic,wu} nixpkgs: -> 03130ec [4z3]	tv	2015-08-20	3	-6/+6
\| *	nomic nixpkgs: 9d5508d -> 1357692	tv	2015-08-20	1	-1/+1
\| *	krebs types net.addrs: s/apply/default/	tv	2015-08-20	1	-1/+2
* \|	Merge branch 'makefu'	lassulus	2015-08-23	15	-54/+244
\|\ \
\| * \|	makefu:add wwan configuration for netzclub	makefu	2015-08-23	1	-0/+17
\| * \|	makefu/cgit: change stockholm description	makefu	2015-08-23	1	-1/+1
\| * \|	Merge branch 'master' of pnp:stockholm	makefu	2015-08-23	1	-0/+10
\| \|\ \
\| \| * \|	makefu: add wwan with wvdial	Felix Richter	2015-08-23	1	-0/+10
\| * \| \|	makefu: add button-3 scrolling to x220 config	makefu	2015-08-23	2	-4/+6
\| \|/ /
\| * \|	makefu: cleanup,refactoring after transfer	makefu	2015-08-23	9	-53/+100
\| * \|	add pornocauster systems	System administrator	2015-08-22	2	-0/+78
\| * \|	makefu:add urlwatch,exim-retiolum	Felix Richter	2015-08-17	3	-3/+33
\| * \|	makefu/pnp: add urlwatch	Felix Richter	2015-08-17	1	-4/+11
\| * \|	urlwatch: fix ca-bundle path	Felix Richter	2015-08-17	1	-2/+1
\| \|/
* \|	lass 2: add bitlbee	lassulus	2015-08-23	2	-1/+17
* \|	lass: add bitlbee-steam support	lassulus	2015-08-23	5	-0/+288
* \|	lass 2 base: disable ntp	lassulus	2015-08-22	1	-0/+3
* \|	Zhosts: specify ports in new format	lassulus	2015-08-20	3	-2/+4
* \|	krebs 3: fix uriel's email	lassulus	2015-08-20	1	-1/+1
* \|	Zhosts: add Port 53 to gum & flap	lassulus	2015-08-20	2	-0/+2
* \|	krebs 3: make uriel secure	lassulus	2015-08-19	1	-0/+1
* \|	krebs 5 youtube-tools: bump rev	lassulus	2015-08-17	1	-2/+2
* \|	lass 1: bump rev	lassulus	2015-08-17	2	-2/+2
* \|	krebs 5: add youtube-tools	lassulus	2015-08-17	2	-0/+22
* \|	Merge branch 'makefu'	lassulus	2015-08-17	4	-50/+126
\|\\|
\| *	services: add new mail	Felix Richter	2015-08-17	1	-1/+1
\| *	krebs/zones: # is not a comment in dns zones ...	Felix Richter	2015-08-17	1	-1/+2
\| *	makefu:add disable_v6	Felix Richter	2015-08-17	1	-0/+4
\| *	makefu:add ramverdoppler	Felix Richter	2015-08-16	1	-0/+3
\| *	makefu: add allow-discards	Felix Richter	2015-08-16	1	-1/+3
\| *	add implementation of /etc/zones/	Felix Richter	2015-08-16	1	-48/+114
* \|	lass 2 base: (re)enable mail	lassulus	2015-08-17	1	-0/+1
* \|	lass 2 base: reject on retiolum	lassulus	2015-08-17	1	-0/+1
* \|	1 lass mors: disable old powertop tuneable	lassulus	2015-08-17	1	-1/+1
* \|	1 lass mors: bump rev	lassulus	2015-08-17	1	-1/+1
\|/
*	Merge remote-tracking branch 'cloudkrebs/master'	Felix Richter	2015-08-16	2	-3/+0
\|\
\| *	lass 2 retiolum: remove obsolete import	lassulus	2015-08-16	1	-1/+0
\| *	lass 2 base: remove nmap	lassulus	2015-08-16	1	-2/+0
* \|	Merge branch 'before-merge'	Felix Richter	2015-08-16	3	-3/+16
\|\ \ \| \|/ \|/\|
\| *	makefu/x200: add thinkfan and tlp	makefu	2015-08-13	1	-1/+7
\| *	makefu:update base	makefu	2015-08-13	1	-2/+4
\| *	add redshift	makefu	2015-08-13	1	-0/+5
\| *	Merge remote-tracking branch 'cd/master' into before-merge	makefu	2015-08-13	1	-91/+91
\| \|\
* \| \|	add posix-array package	Felix Richter	2015-08-16	2	-0/+32
* \| \|	makefu: add rad1o.nix	makefu	2015-08-14	1	-1/+4
* \| \|	Merge remote-tracking branch 'cd/master'	makefu	2015-08-14	15	-584/+643
\|\ \ \
\| * \ \	Merge remote-tracking branch 'mors/master'	tv	2015-08-14	2	-12/+11
\| \|\ \ \