Merge branch 'wip_MDL-50869_m28' of git://github.com/gjb2048/moodle into MOODLE_28_STABLE
commitc06e48e5415ac4ad3d1015c9640f75ec5d1976be
authorDavid Monllao <davidm@moodle.com>
Wed, 26 Aug 2015 01:45:29 +0000 (26 09:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 26 Aug 2015 01:45:29 +0000 (26 09:45 +0800)
treef74fe3b031cad4d5c4e2afb822fa02345c2354aa
parentfd44933e9c83003f23d375aebf95990c9fef76f3
parent7991c2d1052fe8ed7b53e1a038c0dccaadfe9963
Merge branch 'wip_MDL-50869_m28' of git://github.com/gjb2048/moodle into MOODLE_28_STABLE