Merge branch 'MDL-35590-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 05:33:55 +0000 (13:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:15 +0000 (10:15 +0800)
commit6c3def94fa56561e2092ffd427f87b15cc394265
treecd89f8798a9a721985c688729f2c1c6bba38fd77
parent9edcfdad4f375d54e391369f201f709c95a06de7
parent6759dc35fe2eecd73b3b82ce59d132b0d7f24c4d
Merge branch 'MDL-35590-master' of git://github.com/lameze/moodle