gorhgorh 1f2adc4f6e Merge branch 'master' of http://git.cryto.net/Squatconf/Talks		2016-05-01 10:18:52 +02:00
..
day1	moved federated to day one	2016-04-29 02:09:14 +02:00
day2	Merge branch 'master' of http://git.cryto.net/Squatconf/Talks	2016-05-01 10:18:52 +02:00