4 commits

Author	SHA1	Message	Date
Jérôme Loï	f345a00aff	Merge branch 'master' of https://github.com/squatconf/talks ... # By holger krekel (2) and others # Via gorhgorh (3) and Dominic Tarr (2) * 'master' of https://github.com/squatconf/talks: actually add some content to my proposal add LEAP talk proposal some refinements added my talk Added edgenet proposal	2014-10-26 23:39:20 +01:00
Jérôme Loï	b48404a964	update accepted talks	2014-10-26 23:38:49 +01:00
joates	483c05a39f	fruit	2014-10-17 20:46:05 +01:00
joates	eff7a3d3b8	vegetables	2014-10-17 20:45:47 +01:00