Merge branch 'master' of astrom.hq.c3d2.de:ds-quiz
Conflicts: data.27c3/suggestions.txt
This commit is contained in:
commit
8bb91ec949
|
@ -2,9 +2,13 @@
|
|||
Epileptiker mit animierten Gifs angegriffen
|
||||
http://royal.pingdom.com/2010/12/21/the-major-incidents-on-the-internet-in-2010/
|
||||
|
||||
What App did Apple not censor?
|
||||
Wikileaks http://bits.blogs.nytimes.com/2010/12/21/why-apple-removed-wikileaks-app-from-its-store/
|
||||
|
||||
Who is Little Bobby Tables in the real world?
|
||||
image: http://xkcd.com/327/
|
||||
Sex Offender from Oklahoma: http://www.schneier.com/blog/archives/2008/04/oklahoma_data_l.html
|
||||
Voter from Sweden: http://www.wired.co.uk/news/archive/2010-09/24/sweden-election-hack
|
||||
?
|
||||
?
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user