Merge remote-tracking branch 'origin/master'

af2b5105 · Régis Blanc · d82c2982 · 6d090514 · af2b5105
Commit af2b5105 authored 13 years ago by Régis Blanc
--- a/PERMISSIONS
+++ b/PERMISSIONS
@@ -12,5 +12,5 @@ tail -2 "$0" | ssh git@laragit.epfl.ch setperms ${thisrepo}
 exit $_

 # **Do not** add new lines after the following two!
-WRITERS kuncak psuter rblanc 
+WRITERS kuncak psuter rblanc edarulov
 READERS @lara mazimmer hardy