Index: app/helpers/application_helper.rb
===================================================================
--- app/helpers/application_helper.rb	(revision 2363)
+++ app/helpers/application_helper.rb	(working copy)
@@ -609,6 +609,7 @@
   def avatar(user, options = { })
     if Setting.gravatar_enabled?
       email = nil
+      options[:default] = Setting.gravatar_default
       if user.respond_to?(:mail)
         email = user.mail
       elsif user.to_s =~ %r{<(.+?)>}
Index: app/views/settings/_general.rhtml
===================================================================
--- app/views/settings/_general.rhtml	(revision 2363)
+++ app/views/settings/_general.rhtml	(working copy)
@@ -53,6 +53,9 @@
 
 <p><label><%= l(:setting_gravatar_enabled) %></label>
 <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
+
+<p><label><%= l(:setting_gravatar_default) %></label>
+<%= select_tag 'settings[gravatar_default]', options_for_select(['wavatar', 'identicon', 'monsterid'], Setting.gravatar_default) %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>
Index: lang/en.yml
===================================================================
--- lang/en.yml	(revision 2363)
+++ lang/en.yml	(working copy)
@@ -225,6 +225,7 @@
 setting_mail_handler_api_key: API key
 setting_sequential_project_identifiers: Generate sequential project identifiers
 setting_gravatar_enabled: Use Gravatar user icons
+setting_gravatar_default: Default Gravatars
 setting_diff_max_lines_displayed: Max number of diff lines displayed
 
 permission_edit_project: Edit project
Index: lang/de.yml
===================================================================
--- lang/de.yml	(revision 2363)
+++ lang/de.yml	(working copy)
@@ -223,6 +223,7 @@
 setting_mail_handler_api_key: API-Schlüssel
 setting_sequential_project_identifiers: Fortlaufende Projektkennungen generieren
 setting_gravatar_enabled: Gravatar Benutzerbilder benutzen
+setting_gravatar_default: Standard Gravatarschema
 setting_diff_max_lines_displayed: Maximale Anzahl anzuzeigender Diff-Zeilen
 
 permission_edit_project: Projekt bearbeiten
Index: lang/fr.yml
===================================================================
--- lang/fr.yml	(revision 2363)
+++ lang/fr.yml	(working copy)
@@ -225,6 +225,7 @@
 setting_mail_handler_api_key: Clé de protection de l'API
 setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
 setting_gravatar_enabled: Afficher les Gravatar des utilisateurs
+setting_gravatar_default: Gravatar par défaut
 setting_diff_max_lines_displayed: Nombre maximum de lignes de diff affichées
 
 permission_edit_project: Modifier le projet
Index: config/settings.yml
===================================================================
--- config/settings.yml	(revision 2363)
+++ config/settings.yml	(working copy)
@@ -140,3 +140,5 @@
     To change your notification preferences, please click here: http://hostname/my/account
 gravatar_enabled:  
   default: 0
+gravatar_default:
+  default: 'wavatar'