Merge branch 'master' of ssh://webmasters.boum.org/~/wiki

wiki/src/contribute/calendar.mdwn

 [[!meta title="Calendar"]]
 
-* 2014-06-08:
-  - Firefox 24.6.0 ESR sources are available.
-  - Package and upload Firefox 24.6.0 ESR.
-  - Tag 1.1 in Git.
-  - Start building and uploading 1.1 ISO/IUKs...
+* 2014-07-01: Feature freeze for 1.1. Tag, build and upload 1.1~rc1
+  ISO.
 
-* 2014-06-09:
-  - Finish building  by 12:00 (CEST)
-  - Start testing Tails 1.1 at 12:00 (CEST)...
+* 2014-07-02: Test Tails 1.1~rc1.
 
-* 2014-06-10:
-  - ... and finish it by 12:00 (CEST) on the 10th.
-  - Officially release [Tails 1.1](https://labs.riseup.net/code/projects/tails/roadmap#Tails_1.1)
-
-* 2014-06-11 - [Tails contributors meeting](https://mailman.boum.org/pipermail/tails-dev/2014-May/005818.html)
+* 2014-07-03: Officially release Tails 1.1~rc1.
 
 * 2014-07-05--2014-07-06 - Tails hackfest at
   [IRILL](http://www.irill.org/) (Paris, France)
 
 * 2014-07-08--2014-07-11 - Tails contributors meeting
+
+* 2014-07-20: Package and upload Firefox 24.7.0 ESR. Tag, build and
+  upload 1.1 ISO.
+
+* 2014-07-21: Test Tails 1.1.
+
+* 2014-07-22: Officially release Tails 1.1.