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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-07-14	13	-16/+161
\|\
\| *	m binary-cache: split lass and nixos	makefu	2016-07-14	3	-2/+26
\| *	m mergerfs: init	makefu	2016-07-14	3	-0/+29
\| *	m 2 default:remove useroaming no as it is disabled by default	makefu	2016-07-14	1	-3/+0
\| *	m 2 virtualbox: directly retrieve vboxguestextensions	makefu	2016-07-12	1	-1/+6
\| *	m 2 virtualbox: bump version	makefu	2016-07-11	1	-2/+2
\| *	m: nixpkgs@0546a4a	makefu	2016-07-11	1	-1/+1
\| *	m 1 shoney: configure forward-journal	makefu	2016-07-11	2	-4/+11
\| *	ma 1 omo: init share user	makefu	2016-07-11	1	-1/+4
\| *	m 1 darth: configure with forward-journal, share	makefu	2016-07-11	3	-2/+72
\| *	k 3 m: init honeydrive	makefu	2016-07-11	1	-0/+10
\| *	ma: nixpkgs@0546a4a	makefu	2016-07-11	1	-1/+1
* \|	l 2 buildbot: add vbob wbob & shoney	lassulus	2016-07-14	1	-1/+1
* \|	l 2 nixpkgs: 446d4c1 -> 11a7899	lassulus	2016-07-14	1	-1/+1
* \|	l 2 websites fritz: add golbarrendiebstahl	lassulus	2016-07-13	1	-0/+14
\|/
*	Merge remote-tracking branch 'cd/master'	lassulus	2016-07-10	3	-3/+51
\|\
\| *	test-all-krebs-modules: disable buildbot.master	tv	2016-07-09	1	-1/+3
\| *	Merge remote-tracking branch 'prism/master'	tv	2016-07-09	17	-42/+2450
\| \|\
\| * \|	urlwatch: 2.1 -> 2.2	tv	2016-07-09	2	-2/+48
* \| \|	l 2 websites domsen: always_populate_raw_post_data	lassulus	2016-07-10	1	-0/+1
* \| \|	l 1 prism: add tv as user	lassulus	2016-07-10	1	-0/+12
* \| \|	l 2: add pop to pkgs	lassulus	2016-07-10	1	-0/+1
* \| \|	l 5: add pop	lassulus	2016-07-10	2	-0/+11
* \| \|	l 2 websites domsen: add /piwik to ubikmedia	lassulus	2016-07-08	1	-0/+6
\| \|/ \|/\|
* \|	l 1 mors: add zalando project	lassulus	2016-07-08	1	-6/+9
* \|	l 1 helios: disable ES (again)	lassulus	2016-07-08	1	-5/+5
* \|	l 1 prism: add mk_sql_pair	lassulus	2016-07-08	1	-0/+5
* \|	l 1 helios: use gnome3 as desktopManager	lassulus	2016-07-08	1	-2/+32
* \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-07-08	1	-0/+36
\|\\|
\| *	tv backup: add zu	tv	2016-07-08	1	-0/+36
* \|	l 1 prism: remove obsolete certfile option	lassulus	2016-07-08	1	-1/+0
* \|	Revert "l 1 uriel: update boot.loader options"	lassulus	2016-07-08	1	-2/+2
* \|	s 2 repo-sync: adapt to new api	lassulus	2016-07-07	1	-1/+1
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-07-07	11	-20/+2378
\|\ \
\| * \|	m 5 farpd: init	makefu	2016-06-28	3	-2/+1669
\| * \|	m 5 honeyd: initial commit	makefu	2016-06-27	2	-0/+104
\| * \|	m 1 p: allow 24800 (synergy)	makefu	2016-06-27	1	-1/+1
\| * \|	k 5 awesomecfg: add kiosk config	makefu	2016-06-27	3	-0/+535
\| * \|	k 3 m: add siem network, add ossim stub	makefu	2016-06-27	1	-0/+14
\| * \|	wbob: add synergy	makefu	2016-06-27	1	-18/+26
\| * \|	m 5 ps3netsrv: init	makefu	2016-06-24	2	-0/+30
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-07-07	9	-39/+309
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge remote-tracking branch 'prism/master'	tv	2016-07-07	7	-37/+46
\| \|\ \
\| * \ \	Merge remote-tracking branch 'prism/lassulus'	tv	2016-07-07	8	-26/+74
\| \|\ \ \
\| * \| \| \|	zu: init	tv	2016-07-07	2	-0/+260
\| * \| \| \|	tv: use timesyncd	tv	2016-07-03	5	-4/+1
\| * \| \| \|	tv: define journald default extraConfig	tv	2016-07-03	5	-20/+7
\| * \| \| \|	Revert "tv nginx: define events"	tv	2016-07-03	1	-4/+0
\| * \| \| \|	cd nginx: enable https	tv	2016-07-03	1	-11/+41
* \| \| \| \|	Revert "l 5 q: use curl.bin"	lassulus	2016-07-07	1	-1/+1