Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 16 Jun 2014 08:26:06 +0000 (16:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 16 Jun 2014 08:26:06 +0000 (16:26 +0800)
1  2 
mod/assign/locallib.php
mod/assign/tests/events_test.php

Simple merge
Simple merge