Merge branch 'MDL-49334' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 13:25:33 +0000 (13:25 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 13:25:33 +0000 (13:25 +0000)
commit2076324e7d7f26196b2297c3b9b72b16ccc08735
tree0134667ac9d6092d7e7aca6a317bb88eb772c07c
parentf7681b5181ee537265cfe9e854fa020f6799c377
parentf70fbc05e1141105c61e300166386886234798d7
Merge branch 'MDL-49334' of git://github.com/timhunt/moodle