From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 16 Mar 2016 17:12:18 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/cc1516
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=cbaff96b96d2def874b8a1fa9454414c6602a829;hp=cbaff96b96d2def874b8a1fa9454414c6602a829;p=cc1516.git

Merge branch 'master' of github.com:dopefishh/cc1516

Conflicts:
	deliverables/p1/pre.tex
---