Merge branch 'MDL-46911' of https://github.com/bostelm/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:42:01 +0000 (15:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:42:01 +0000 (15:42 +0800)
commitc8336b973351aaa3f179f5a89acc2327ca9daea7
treeb7c1a9cffe777d24dab5b0f498fd976dd32c6e21
parentcaffd84d44ba41b719bb6732df9f3c7aaf8212d1
parentf09040d76a5d863b48dc7c4f84bb4c7f63c934b8
Merge branch 'MDL-46911' of https://github.com/bostelm/moodle