From: Petter Reinholdtsen Date: Tue, 17 Jul 2012 17:09:11 +0000 (+0200) Subject: Merge fixes from MartinBorg. X-Git-Tag: edition-2015-10-10~2370 X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/b3ce8300af6a3b2ce5b408a0e82e361d005d0a09 Merge fixes from MartinBorg. --- b3ce8300af6a3b2ce5b408a0e82e361d005d0a09 diff --cc freeculture.xml index 2f13118,e07b6e4..9258f03 --- a/freeculture.xml +++ b/freeculture.xml @@@ -12213,6 -12254,7 +12258,8 @@@ permitted within the European Union. See Peter Drahos with John Braithwaite, Information Feudalism: Who Owns the Knowledge Economy? (New York: The New Press, 2003), 37. + Braithwaite, John ++Drahos, Peter