Merge remote-tracking branch 'origin/master'

wiki/src/blueprint/SponsorS/reports/2016_01.mdwn

@@ -46,7 +46,13 @@ Everything in this report can be made public.
    This is not a security problem in Tails since we drop non-Tor
    traffic by default, but for this very reason in breaks the
    functionality of the autoconfig wizard in the context of Tails.
-   We started to write a proof-of-concept patch to fix this bug.
+   We started to write a proof-of-concept patch to fix this bug which 
+   will be submitted upstream in February.
+
+   In order to improve Icedove's security in Tails and avoid unforeseen exploits,
+   we started evaluating an AppArmor profile for Icedove ([[!tails_ticket 10750]]).
+   We've asked the author to submit it upstream where it's now waiting to be merged.
+   In the meantime, we will ship this profile in Tails on our own.
 
 ## A.1.6. Release Icedove in Tails
 

wiki/src/contribute/meetings/201602.mdwn

@@ -51,7 +51,7 @@ upgrades pinentry-gtk2 to 0.9.7-1
 
 Right-now there as three keyboard shortcuts to change keyboard layout:
 
-  - Shift+Super+Space which is provided by GNOME.
+  - Super+Space which is provided by GNOME.
   - Shift+Shift which is custom to Tails (added in e492749). segfault
     will see whether we should get rid of this one as well.
   - Alt+Shift which is custom to Tails (added in 370f48c). Saying that