Merge branch 'wip-MDL-50932-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 03:43:42 +0000 (11:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 03:43:42 +0000 (11:43 +0800)
commit7d8edf67ae1fbda154dfb08b11d358eb4a848d65
treed21439f60e3e64b4261bac67f7a0065af439d8a2
parent87aadca845a14557ef3463fece45ae49e95c540d
parent7b3c5e0e0bf77b919537570702388dee6004fa31
Merge branch 'wip-MDL-50932-master' of git://github.com/marinaglancy/moodle