stockholm - Make all the systems into 1systems!

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of nomic:config	lassulus	2015-06-14	1	-0/+2
\|\
\| *	nixos-build: make <pubkeys> available	tv	2015-06-14	1	-0/+2
\| \|
* \|	deploy: take optional target argument	lassulus	2015-06-14	1	-4/+3
\|/
*	deploy: merge next	tv	2015-05-21	26	-314/+123
\|
*	backtrace: diverge	tv	2015-05-21	1	-1/+17
\|
*	cac-get-server-by: no match -> return null	tv	2015-05-21	1	-1/+3
\|
*	cac-ssh: use json-assert-type	tv	2015-05-21	2	-1/+17
\|
*	sh: functions -> bin/	tv	2015-05-21	41	-0/+628