Merge branch '2.5' into 2.6

weaverryan · weaverryan · commit 256085127ca1 · 2014-12-30T22:27:49.000-05:00
* 2.5:
  removing duplicate key
diff --git a/book/security.rst b/book/security.rst
@@ -1061,8 +1061,6 @@ key:
 
 .. _book-security-logging-out:
 
-.. _book-security-logging-out:
-
 Logging Out
 -----------
 
