branching isn't working

[Graham Percival]

So Mike just pushed
09f09c054a7c985424925605c237c78b9adb4047
with a regtest with a version number of 2.15.0.  That was because
I told him to change the previous number fo 2.13.61, since the
commit wasn't going to be part of 2.13.61.

This broke the regtest compiling, because master still uses a
VERSION of 2.13.61.  I dumped a hack
ae2b0737eefb8e1b6c7fc88fc4e5a780ddf77d49
to fix this, but it doesn't feel right.

We can't just change VERSION in git master, because that's used to
generate the website, and we don't want to advertising a mythical
version 2.15.0.  We could switch the website to be generated from
stable/2.14, but then whenever we released a new 2.15.x version
we'd have to patch the stable/2.14 branch, etc.


This doesn't seem to be working.


I propose that we drop the stable/2.14 idea and sort out branches
during GOP.  There's just too much confusion about what we're
supposed to be doing, and I don't think it's helping.  If somebody
wants to do any major work, then do it on your own branch and
don't propose it for inclusion until 2.14 is out.

Cheers,
- Graham