Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle

diff --cc lib/deprecatedlib.php
index bb07620,b400980..33a9c0a
--- 1/lib/deprecatedlib.php
--- 2/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@@ -4393,3 -4352,11 +4393,11 @@@ function get_related_contexts_string(co
          return (' ='.$context->id);
      }
  }
 -}
+ 
+ /**
+  * @deprecated since Moodle 2.0 - use $PAGE->user_is_editing() instead.
+  * @see moodle_page->user_is_editing()
+  */
+ function isediting() {
+     throw new coding_exception('isediting() can not be used any more, please use $PAGE->user_is_editing() instead.');
++}

diff --cc lib/moodlelib.php
Simple merge