Merge master into experimental
commit38a8e92fba642ed2541bcfd95b71d9825aa0873b
authorBenjamin Kaduk <kaduk@mit.edu>
Fri, 1 Sep 2017 21:20:16 +0000 (1 16:20 -0500)
committerBenjamin Kaduk <kaduk@mit.edu>
Fri, 1 Sep 2017 21:20:57 +0000 (1 16:20 -0500)
tree91b4bc53da9b3d23755262d5adb281182a9579ae
parent034f156833fafd4e145c62e09be2e1a6597127d6
parentf417b0dd946bab68b4f8cf750402434d6270c29c
Merge master into experimental

Pick up the FORCE_SOURCE_DATE change and changelog entry, but ignore
the new patch there, which is already included in 1.8.0pre2.

Change-Id: Idbe6b09e863456c186de93edfa89eb9bbd5d14e0
debian/changelog
debian/rules