Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:38:34 +0000 (16:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 08:38:34 +0000 (16:38 +0800)
commit73152e4dffcf11a9e1e7bbe1190e1d492c676849
tree1c576db8e7abba7bfaeb85ba66096ef5670ae222
parent470e087d80dc641897f1bcf74a5ccb812ff2bbdd
parent01dfdf7e41bdb5f2dcbe22509a498e603daae73d
Merge branch 'wip-MDL-48760-master' of git://github.com/abgreeve/moodle