sorting out branch conflicts

[Graham Percival]

To whoever enjoys this stuff,

1) please check that stable/2.14 has no useful commits that are not
  in master.  I think the only difference is in VERSION and
  various disasters concerning Documentation/web/news-front.itexi,
  but I'd like to be safe.

2) make release/unstable be exactly what we have in master.  I'd
  like to release 2.15.0 on the 7th.


Yes, #2 is almost certainly a one-line "force fast-foward" or
"force push" command, but I'm not going to screw around with that
stuff in a public repository when it's after midnight.  Much
better to leave it to somebody who's alert and knows what they're
doing.

Cheers,
- Graham