Merge remote-tracking branch 'winterfairy/feature/import-translations' into devel
commit1eadf87a0b47802ba03a8ae70986b3f89b53685b
authorTails developers <amnesia@boum.org>
Sat, 30 Nov 2013 14:32:45 +0000 (30 14:32 +0000)
committerTails developers <amnesia@boum.org>
Sat, 30 Nov 2013 14:32:45 +0000 (30 14:32 +0000)
treefee90acabafb7e628e5445507506fb08da0059ae
parentd5fa037f5ce98b0e35b199f37bf75c160a4ddbc9
parenta96b705a777a05ffc5905155b4fd0ce38f0eea12
Merge remote-tracking branch 'winterfairy/feature/import-translations' into devel