Re: core-updates, next release, and all that

[Leo Famulari]

On Sat, Jul 23, 2016 at 12:06:49AM +0200, Andreas Enge wrote:
> Hello Leo,
> 
> some of the failures are due to missing sourceforge tarballs. I think
> we should merge master into core-updates and start a new evaluation.

Done. I also wrote a description of the conflicts I resolved in the
commit message. I think this is useful, since I've had difficulty
learning this information about other merges in the past.