Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
x
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
Revert "x"

This reverts commit f84453497bd5ef4eba8bca84917b8e82d784937a.
Merge remote branch 'upstream/master'
revert that bit
tgroup_check - decrypt if obscured before checking body text for reshares
update to German strings
Merge pull request #677 from zzottel/master

update to German strings
update to German help files
Merge pull request #678 from zzottel/master

update to German help files