WP Merge to revision 8180

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1336 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 8 deletions

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index c964b09..70f9bdf 100644
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -8,19 +8,11 @@
  */
 
 #
-# Portable PHP password hashing framework.
-#
-# Version 0.1 / genuine.
-#
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
 # the public domain.
 #
 # There's absolutely no warranty.
 #
-# The homepage URL for this framework is:
-#
-#	http://www.openwall.com/phpass/
-#
 # Please be sure to update the Version line if you edit this file in any way.
 # It is suggested that you leave the main version number intact, but indicate
 # your project name (after the slash) and add your own revision information.
@@ -32,6 +24,15 @@
 # Obviously, since this code is in the public domain, the above are not
 # requirements (there can be none), but merely suggestions.
 #
+
+/**
+ * Portable PHP password hashing framework.
+ *
+ * @package phpass
+ * @version 0.1 / genuine
+ * @link http://www.openwall.com/phpass/
+ * @since 2.5
+ */
 class PasswordHash {
 	var $itoa64;
 	var $iteration_count_log2;