# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1363099189 0
# Node ID 324461c477a7a79dc4a1d421dc7424daf7d79c89
# Parent  2c59ee348e2beb011fb8650e2160b7d47a9584ac# Parent  31aee88c279bbef624dcd515027e22fcff01586f
Merge

diff -r 2c59ee348e2b -r 324461c477a7 config/locales/en.yml
--- a/config/locales/en.yml	Tue Mar 12 14:39:44 2013 +0000
+++ b/config/locales/en.yml	Tue Mar 12 14:39:49 2013 +0000
@@ -883,7 +883,7 @@
   label_parent_revision: Parent
   label_child_revision: Child
   label_export_options: %{export_format} export options
-  label_my_colleagues: People I'm working with
+  label_my_colleagues: "Active projects for people I'm working with"
   label_working_in: Working in 
   label_no_active_colleagues: No recent activity
 
diff -r 2c59ee348e2b -r 324461c477a7 public/stylesheets/application.css
--- a/public/stylesheets/application.css	Tue Mar 12 14:39:44 2013 +0000
+++ b/public/stylesheets/application.css	Tue Mar 12 14:39:49 2013 +0000
@@ -1035,7 +1035,8 @@
 
 #activity dt img.gravatar, #members dt img.gravatar, #active-colleagues img.gravatar {
     float: left;
-    margin: 0 1em 1em 0;
+    clear: left;
+    margin: 0.2em 1em 0.4em 0;
 }
 
 /* Used on 12px Gravatar img tags without the icon background */