From: ben <ben@saturne.(none)>
Date: Sat, 3 Oct 2015 20:08:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: edition-2015-10-10~42^2~3
X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/faace483a52cd0bbc44c53e6006a71a4f08f7ae9?ds=sidebyside

Merge remote-tracking branch 'upstream/master'

Conflicts:
	freeculture.fr.po
---

faace483a52cd0bbc44c53e6006a71a4f08f7ae9