Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Apr 2016 09:47:19 +0000 (10:47 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Apr 2016 09:47:19 +0000 (10:47 +0100)
commit393329069d78d62ee336d4c32550ef641660783a
treefe647fc538372979d91000fde02e9cb9f8da2648
parent88e8e6006fa51ac0f493e94e756d5e41ae0ed0b4
parentd329a1ea2f6db26e2e61a53b4e48c01535d0474e
Merge branch 'MDL-53175-master' of git://github.com/jleyva/moodle