From: Petter Reinholdtsen <pere@hungry.com>
Date: Mon, 5 Oct 2015 21:24:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'marsgui/master'
X-Git-Tag: edition-2015-10-10~34
X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/aa8f70e870f737b72a0f42aaa7e5d304791c0aa6?ds=sidebyside

Merge remote-tracking branch 'marsgui/master'
---

aa8f70e870f737b72a0f42aaa7e5d304791c0aa6