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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'cd/master'	lassulus	2016-10-13	4	-30/+14
\|\
\| *	lib: don't define defaults that require config	tv	2016-10-13	2	-13/+1
\| *	krebs lib: move {eq,ne,mod} to lib	tv	2016-10-13	1	-5/+0
\| *	lib: inline has-default-nix	tv	2016-10-13	2	-3/+1
\| *	lib: remove addName*	tv	2016-10-13	2	-6/+6
\| *	krebs lib: with lib	tv	2016-10-13	1	-3/+6
* \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-10-13	1	-64/+0
\|\\|
\| *	Merge remote-tracking branch 'prism/master'	tv	2016-10-13	3	-9/+46
\| \|\
\| * \|	exim: RIP	tv	2016-10-13	1	-64/+0
* \| \|	Revert "k 3 buildbot: remove override (upstream fix)"	lassulus	2016-10-13	1	-2/+9
\| \|/ \|/\|
* \|	remove comments from php config, phpfpm error	lassulus	2016-10-12	1	-1/+0
* \|	Merge remote-tracking branch 'prism/master'	lassulus	2016-10-11	2	-8/+46
\|\ \ \| \|/ \|/\|
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-06	2	-8/+46
\| \|\
\| \| *	k 3 repo-sync: add more explicit documentation	makefu	2016-09-07	1	-6/+34
\| \| *	Merge remote-tracking branch 'prism/lassulus'	makefu	2016-09-07	1	-1/+1
\| \| \|\
\| \| * \|	k 5 pwqgen: allow user-provided wordset	makefu	2016-08-24	1	-2/+12
* \| \| \|	tv nixpkgs: 2568ee3 -> 45b2a6d	tv	2016-10-08	7	-7/+7
\|/ / /
* \| /	k 4 types: add default value for user.mail	lassulus	2016-09-09	1	-0/+1
\| \|/ \|/\|
* \|	k 3 rtorrent: fix tmux binary path	lassulus	2016-08-24	1	-1/+1
\|/
*	m 3 rtorrent -> k 3 rtorrent	makefu	2016-08-24	3	-0/+364
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-08-24	1	-1/+28
\|\
\| *	k 3 m: move tracker.makefu.r to gum	makefu	2016-08-22	1	-1/+28
* \|	k 3 l: update mors ssh key	lassulus	2016-08-22	1	-1/+1
\|/
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-08-21	1	-0/+23
\|\
\| *	Merge remote-tracking branch 'prism/master'	makefu	2016-08-21	6	-13/+86
\| \|\
\| * \|	m : init drop	makefu	2016-08-21	1	-0/+23
* \| \|	vncdotool: RIP (upstream dilapidated)	tv	2016-08-21	1	-20/+0
* \| \|	Merge remote-tracking branch 'prism/master'	tv	2016-08-21	1	-0/+34
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	k 5: add games-user-env	lassulus	2016-08-10	1	-0/+34
* \| \|	logf: don't call jq's gsub with empty regex :)	tv	2016-08-11	1	-1/+2
\|/ /
* \|	krebs internet-aliases: use explicit addresses	tv	2016-08-09	1	-2/+5
* \|	Merge remote-tracking branch 'prism/master'	tv	2016-08-07	3	-11/+26
\|\ \
\| * \|	k 5 apt-cacher-ng: update 0.9.3 -> 0.9.3.2	lassulus	2016-08-06	1	-2/+2
\| * \|	k 3 buildbot: remove override (upstream fix)	lassulus	2016-08-05	1	-9/+2
\| * \|	k 5 builders: add writePython{2,3}	lassulus	2016-08-04	1	-0/+22
\| \|/
* /	tarantool: init at 1.7.1-164-g0fd0239	tv	2016-08-07	1	-0/+21
\|/
*	logf: make urgency patterns configurable	tv	2016-08-04	1	-3/+7
*	logf: survive non-JSON input	tv	2016-08-04	1	-2/+7
*	logf: add default color for undefined priority	tv	2016-08-04	1	-0/+1
*	logf: reduce redundant syntax	tv	2016-08-04	1	-3/+3
*	Merge remote-tracking branch 'gum/master'	tv	2016-08-02	9	-28/+250
\|\
\| *	k 3 power-action: fix description	lassulus	2016-08-02	1	-1/+1
\| *	k 3 power-action: don't create configured user	lassulus	2016-08-02	1	-8/+3
\| *	k 3 retiolum: fix documentation text	makefu	2016-07-28	1	-2/+1
\| *	k 4 types: tinc.extraConfig	makefu	2016-07-28	1	-0/+7
\| *	makefu: pornocauster -> x	makefu	2016-07-28	1	-7/+9
\| *	retiolum: support nets.<net>.tinc.port	makefu	2016-07-28	2	-3/+10
\| *	Merge remote-tracking branch 'prism/master'	makefu	2016-07-27	8	-10/+172
\| \|\
\| \| *	l 3 power-action -> k 3 power-action	lassulus	2016-07-26	2	-0/+98
\| \| *	Merge remote-tracking branch 'cd/master'	lassulus	2016-07-23	4	-7/+47
\| \| \|\