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

	Commit message (Collapse)	Author	Age	Files	Lines
*	k 3 buildbot: fix merge fuckup	makefu	2015-12-23	1	-5/+0
\|
*	Merge branch 'master' of gum.krebsco.de:stockholm	makefu	2015-12-23	1	-0/+5
\|\
\| *	m 3 buildbot: add new slow factory to complete integration test	makefu	2015-12-23	1	-16/+31
\| \|
* \|	k 5 mv krebs-ci test/infest-cac-centos7	makefu	2015-12-23	1	-3/+3
\| \|
* \|	m 3 buildbot: add new slow factory to complete integration test	makefu	2015-12-23	2	-17/+36
\|/
*	k 5 krebs-ci: remove obsolete trap rm	makefu	2015-12-22	1	-1/+1
\|
*	mv makefu->krebs 3 buildbot	makefu	2015-12-22	2	-0/+448