Merge remote-tracking branch 'jcflack/early-env'
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 08:44:51 +0000 (09:44 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 08:44:51 +0000 (09:44 +0100)

Trivial merge