Merge branch 'pingunaut-1166_more_secure_password_hashes' into master.

diff --cc src/main/distrib/data/defaults.properties
Simple merge

diff --cc src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index 0a6981b3efe58c8b429f09dbfe20570c0d0c0644,94dd35abdee825d20bd9796e72f40dd6e184d255..5b0b0147829950ff9a3b6ff5162cf0d235870548
--- 1/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
--- 2/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@@ -20,8 -20,8 +20,9 @@@ import java.util.ArrayList
  import java.util.Collections;\r
  import java.util.Iterator;\r
  import java.util.List;\r
 +import java.util.Locale;\r
  \r
+ import com.gitblit.utils.PasswordHash;\r
  import org.apache.wicket.PageParameters;\r
  import org.apache.wicket.behavior.SimpleAttributeModifier;\r
  import org.apache.wicket.extensions.markup.html.form.palette.Palette;\r