Merge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 11:10:19 +0000 (11:10 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 11:10:19 +0000 (11:10 +0000)
1  2 
calendar/lib.php

Simple merge