From: Petter Reinholdtsen <pere@hungry.com>
Date: Wed, 24 Jul 2013 09:45:15 +0000 (+0200)
Subject: resolve conflict.
X-Git-Tag: edition-2015-10-10~977
X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/e2ab7b94338f8e839d19337152f374366b69512a?ds=sidebyside

resolve conflict.
---

e2ab7b94338f8e839d19337152f374366b69512a