Merge branch 'master' into experimental
commitadfcf7e1fdef89891835f7030a8993692df6d07f
authorBenjamin Kaduk <kaduk@mit.edu>
Thu, 31 Aug 2017 01:09:27 +0000 (30 20:09 -0500)
committerBenjamin Kaduk <kaduk@mit.edu>
Thu, 31 Aug 2017 01:09:27 +0000 (30 20:09 -0500)
tree47ccfe50c8120d4316bb45f7dae0ffce336327f7
parent8b239bd410e7cb1314655e3165e5726afd08318f
parentee4f17dcaa0df17187eaf597b6952c9002df4356
Merge branch 'master' into experimental

Pick up packaging changes that occurred since experimental diverged
from master.

(Ignore debian/patches/ though.)

Change-Id: I4f27140f33c8da1e0beaa6d0f23f0528fc9bd090
debian/changelog
debian/control
debian/rules