Merge branch 'v0.13.x' of https://github.com/PythonCharmers/python-future into v0.13.x

Author: edschofield

docs/compatible_idioms.rst

@@ -11,7 +11,7 @@ This notebook shows you idioms for writing future-proof code that is
 compatible with both versions of Python: 2 and 3.
 
 It accompanies Ed Schofield's talk at PyCon AU 2014, "Writing 2/3
-compatible code".
+compatible code". (The video is `here <http://www.youtube.com/watch?v=KOqk8j11aAI&t=10m14s>`_.) 
 
 Minimum versions:
 

docs/notebooks/Writing Python 2-3 compatible code.ipynb

@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:4569bf2488b392f4d95eda8d1f5069a4b57beeefd63826b664af5e734716438f"
+  "signature": "sha256:7db933b5a50e496cdc50293a11e19a9f4e9495eb129f7ae5e256690df94f47be"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -26,7 +26,7 @@
       "\n",
       "A PDF version is here: http://python-future.org/compatible_idioms.pdf\n",
       "\n",
-      "This notebook shows you idioms for writing future-proof code that is compatible with both versions of Python: 2 and 3. It accompanies Ed Schofield's talk at PyCon AU 2014, \"Writing 2/3 compatible code\".\n",
+      "This notebook shows you idioms for writing future-proof code that is compatible with both versions of Python: 2 and 3. It accompanies Ed Schofield's talk at PyCon AU 2014, \"Writing 2/3 compatible code\". (The video is here: <http://www.youtube.com/watch?v=KOqk8j11aAI&t=10m14s>.)\n",
       "\n",
       "Minimum versions:\n",
       "\n",