Re: [Tails-l10n] [Merge](de) Tails 0.22.1 announce and secur…

On Mon, Feb 10, 2014 at 8:53 PM, Frithjof <sfrithjof@???> wrote:
> Please merge
>
> [master 087083c] [de] 0.22.1 announce and security advisory.
> [master a3a4456] [de] doc/about/license.de.po.
> [master f7e034c] [de] review.
>
> in frithjof/tails.

[master 538167a] Merge branch 'master' of https://git-tails.immerda.ch/tails.

also resolves a merge conflict, that I should have resolved earlier.

--Frithjof