Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
commit0255780b9c0ff94dbeafc5aa4fc0bd582ee38351
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:30:28 +0000 (23 17:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:19 +0000 (24 11:48 +0200)
treeb2bbba89f03f50f1fc9aac5b100206e45d6093dd
parenta5f9fc6be34eb3352b455a2d1bb432e09684c657
parentcda62a3829ffdbc971cfded244c99916f6382667
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle