Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 07:29:58 +0000 (15:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Aug 2015 07:29:58 +0000 (15:29 +0800)
commit259bd67ce920fb4187026566a0f81a469ec6e699
tree956d2bae37fc0916033d82d21ca675dd1f237930
parente0d08bfa5d7f27f840b703f34139bdb94f28420c
parentba2ad4316ed299996b5a53bc0b4e7264422969ae
Merge branch 'MDL-51184-master' of git://github.com/marinaglancy/moodle