Re: news: fix botched merges, rebase on 1.11.2a NEWS version

[Stefano Lattarini]

On 01/01/2012 02:23 PM, Stefano Lattarini wrote:
> The NEWS file is unfortunately written in a format that doesn't
> lend itself very well to automatic merges; the recent merges of
> maint into master have left it full of blunders and in a somewhat
> inconsistent state.
> 
> Another orthogonal issue is that the current version of NEWS
> still reports all the changes since the last 1.11 version, rather
> than since the latest maintenance version 1.11.2, or, even better,
> since the planned next maintenance version 1.11.3.
> 
> -*-*-
> 
> Attached is a patch that should fix both these issues.  In addition
> to that, the diffs between the updated NEWS file in master and the
> NEWS file in branch-1.11 are attached as well.
> 
> I will push by this evening or tomorrow if there is no objection.
> 
Pushed now.

Regards,
  Stefano