[m-rev.] for review: fix bug #183

[Paul Bone]

On Wed, May 22, 2013 at 05:45:32PM +1000, Peter Wang wrote:
> On Wed, 22 May 2013 16:57:57 +1000 (EST), Julien Fischer <jfischer at opturion.com> wrote:
> > 
> > On Wed, 22 May 2013, Peter Wang wrote:
> > 
> > > On Wed, 22 May 2013 15:28:56 +1000 (EST), Julien Fischer <jfischer at opturion.com> wrote:
> > >>
> > >> Done, diff follows.
> > >
> > > Does this not belong on 13.05?
> > 
> > Yes, it probably should have gone onto that branch.
> 
> Ok.
> 
> Can we agree to commit fixes to the 13.05 branch, and defer merges so we
> get fewer of them?  If you're about to commit an intrusive change on
> master that would make merging 13.05 non-trivial after the change, then
> go ahead and merge first.
> 
> I'm tempted to rewrite 'master' and make it neat :)
> 

This is probably a good time to create some type of policy WRT how we use
git and mainline/release/development branches.


-- 
Paul Bone
http://www.bone.id.au