Merge branch 'MDL-51250-master-3' of git://github.com/junpataleta/moodle
commitc20c16c1541fa8d8c960c3392548e190e8f80271
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 03:15:26 +0000 (7 11:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Oct 2015 03:15:26 +0000 (7 11:15 +0800)
treed9e4dacf8dd2a34afd0f0179b6a86b6a276533ef
parentbbad52793baa46ce1d30cebb8913346429bef9d9
parentd264cbbb8a15f40ad1c4616046852ee2e00754ab
Merge branch 'MDL-51250-master-3' of git://github.com/junpataleta/moodle