Merging all fixes for 2.9

[Inge Wallin]

On Thursday, January 22, 2015 14:34:07 Jaroslaw Staniek wrote:
> Good, would it be possible to skip the recent buggy commit
> 2c40d8b87db167dd1d77341daabb2ed7837ee46b
> ?

I don't know how.  Except first merge it, buggy commit and all, and then revert 
that particular commit.

But why don't you revert it in 2.9 already?

	-Inge

> On Thursday, 22 January 2015, Inge Wallin <inge at lysator.liu.se> wrote:
> > On Thursday, January 22, 2015 12:02:47 Cyrille Berger wrote:
> >> On 2015-01-19 22:35, Inge Wallin wrote:
> >> > On Monday, January 19, 2015 17:25:33 Inge Wallin wrote:
> >> >> On Monday, January 19, 2015 17:26:45 Boudewijn Rempt wrote:
> >> >> > If you do, I think it should be an ordinary merge, not a squash.
> >> >> 
> >> >> yes, agree.
> >> > 
> >> > Done.  It went totally without problems.
> >> > 
> >> > I think we should do this every 3-5 days at least so that we don't end
> >> > up with
> >> > a big problem that will be difficult to unwind later.
> >> 
> >> That was the original plan, but nobody had the time to do it until now I
> >> guess :) And that is also why we "froze" master.
> > 
> > As I mentioned on IRC, I am willing to do this 2-3 time per week.  In
> 
> fact, I
> 
> > was planning to do it again tonight.
> > 
> >         -Inge
> > 
> > _______________________________________________
> > calligra-devel mailing list
> > calligra-devel at kde.org
> > https://mail.kde.org/mailman/listinfo/calligra-devel