[CCC DEV] kroc-1.5 vs. master: battle

[Adam Sampson]

Martin Ellis <ellism88 at gmail.com> writes:

> Try and cherry pick 1.5 changes into master.

There shouldn't be any need for that -- there won't be any changes in
1.5 that aren't already in master.

> Create a 1.6 branch to avoid any confusion and tag it as 1.6.0.

That sounds like a sensible plan -- leave the 1.5 branch as is, and
start a new 1.6 branch from current master.

Thanks,

-- 
Adam Sampson <ats at offog.org>                         <http://offog.org/>