Merge lp:~brian-murray/britney/britney2-ubuntu

britney.conf

@@ -36,16 +36,22 @@ MINDAYS_EMERGENCY = 0
 DEFAULT_URGENCY   = medium
 
 # hint permissions
-HINTS_CJWATSON    = ALL
+HINTS_CJWATSON     = ALL
-HINTS_ADCONRAD    = ALL
+HINTS_ADCONRAD     = ALL
-HINTS_KITTERMAN   = ALL
+HINTS_KITTERMAN    = ALL
-HINTS_LANEY       = ALL
+HINTS_LANEY        = ALL
-HINTS_JRIDDELL    = ALL
+HINTS_JRIDDELL     = ALL
-HINTS_STEFANOR    = ALL
+HINTS_STEFANOR     = ALL
-HINTS_STGRABER    = ALL
+HINTS_STGRABER     = ALL
-HINTS_VORLON      = ALL
+HINTS_VORLON       = ALL
-HINTS_PITTI       = ALL
+HINTS_PITTI        = ALL
-HINTS_FREEZE      = block block-all
+# SRU team
+HINTS_RAOF         = ALL
+HINTS_BRIAN-MURRAY = ALL
+HINTS_TJAALTON     = ALL
+HINTS_ARGES        = ALL
+HINTS_APW          = ALL
+HINTS_FREEZE       = block block-all
 
 HINTS_UBUNTU-TOUCH/DIDROCKS     = block unblock
 HINTS_UBUNTU-TOUCH/EV           = block unblock