Merge branch 'MDL-50814-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:55:06 +0000 (08:55 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 07:55:06 +0000 (08:55 +0100)
commitaf78b79a582fe5d228dd766f746b6fff27d7e5bc
tree0d2c9c54b1363c9167bc07fbcebe1e2d53ebeb8a
parent22c844acf43dc125a2cafb8b58a1571e1b44f328
parentd3754a972d8fdc6e43ee44866c005b4c7f67f7b1
Merge branch 'MDL-50814-master' of git://github.com/jleyva/moodle