Merge branch 'MDL-49561_master' of git://github.com/markn86/moodle

Conflicts:
	lib/bennu/readme_moodle.txt

diff --cc lib/bennu/readme_moodle.txt
index f623332,e0b270a..91fcf4c
--- 1/lib/bennu/readme_moodle.txt
--- 2/lib/bennu/readme_moodle.txt
+++ b/lib/bennu/readme_moodle.txt
@@@ -7,4 -7,4 +7,5 @@@ modifications
  4/ updated rfc2445_is_valid_value() to accept single part rrule as a valid value (16 Jun 2014)
  5/ updated DTEND;TZID and DTSTAR;TZID values to support quotations (7 Nov 2014)
  6/ added calendar_normalize_tz function to convert region timezone to php supported timezone (7 Nov 2014)
 -7/ added timestamp_to_date function to support zero duration events (4 Sept 2015)
 +7/ MDL-49032: fixed rfc2445_fold() to fix incorrect RFC2445_WSP definition (16 Sep 2015)
++8/ added timestamp_to_date function to support zero duration events (16 Sept 2015)