Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
commit89df18c73d65fa763521be2814f5b5161fc50a94
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:30:28 +0000 (23 17:30 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:30:28 +0000 (23 17:30 +0100)
treeb1676240bac74693129da4333611aa6934811e99
parentf01242a3b485cf4ddef0a37994a4e8ff81c341d2
parentcda62a3829ffdbc971cfded244c99916f6382667
Merge branch 'MDL-47791' of git://github.com/timhunt/moodle