Re: [Tails-dev] Please review'n'merge feature/pidgin-2.10

Hi,

On Wed, Jan 29, 2014 at 08:43:43PM +0100, intrigeri wrote:
> Hi,
>
> Note: pretty urgent, I think we want this in 0.22.1, so it should be
> merged by Saturday (say, noon CET to the latest). Assigned to sajolida
> for review'n'merge, since I've no idea if anyone with the right
> credentials is available on so short notice these days.
>
> ticket: #6629
> branch: feature/pidgin-2.10

Build an iso based on stable with the feature branch merged in (had to do
some apt pining tricks) and tested it. I did the release tests, IRC, XMPP
and OTR do work, so I bet it is ready to be merged. So did I into devel
(was a hell of a merge btw). I wonder if I should have merged it into
stable? If I messed something, fell free to rebase/revert anyway, you
still have my ack for it to be merged.

bert.