Merge branch 'MDL-51083-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 08:57:06 +0000 (16:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 08:57:06 +0000 (16:57 +0800)
commitfb7b835cdd52dab9712845354b89ddb921392702
tree6740a343987022ced79c102f70887ca4d1a8b7b9
parent30b86ccb689509ced2fee4d9a111d9c21e4d54f2
parentf209d5e1bedc36241fb0ec37a07a81147c363662
Merge branch 'MDL-51083-master' of git://github.com/xow/moodle