[Rivet] Merging 2-3-x into default

[Chris Pollard]

Hi all,

I hope I have done the right thing here... If not please chime in!

I've merged in all changes from 2-3-x into default with the plan to make
the 2-4-x branch as soon as the final lingering analyses have been
validated and checked in. Please make any additional changes to the default
branch from here on out.

I am about to run the validation scripts on the default branch and will let
you know the outcome.

Cheers,

Chris
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.hepforge.org/lists-archive/rivet/attachments/20151005/8b807ee3/attachment.html>