Merge branch 'wip-mdl-34777' of git://github.com/rajeshtaneja/moodle

diff --cc grade/report/grader/lib.php
Simple merge

diff --cc mod/assign/gradingtable.php
index 95cb3b2,43e7a5b..fb68b32
--- 1/mod/assign/gradingtable.php
--- 2/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@@ -158,12 -158,11 +158,11 @@@ class assign_grading_table extends tabl
          if (!$this->is_downloading()) {
              $columns[] = 'select';
              $headers[] = get_string('select') .
-                         '<div class="selectall"><input type="checkbox" name="selectall" title="' .
-                         get_string('selectall') .
-                         '"/></div>';
+                     '<div class="selectall"><label class="accesshide" for="selectall">' . get_string('selectall') . '</label>
+                     <input type="checkbox" id="selectall" name="selectall" title="' . get_string('selectall') . '"/></div>';
  
 -            // Edit links.
 -            $columns[] = 'edit';
 +            // We have to call this column userid so we can use userid as a default sortable column.
 +            $columns[] = 'userid';
              $headers[] = get_string('edit');
          }
  

diff --cc mod/assign/lang/en/assign.php
Simple merge

diff --cc mod/assign/locallib.php
Simple merge