Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 09:19:59 +0000 (17:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 09:19:59 +0000 (17:19 +0800)
commit6b7421003b4c794d582cc3514245ed7662b8708e
tree6cd0d20cb9db8b438967695020e9da1e3a560f19
parent1dea567d6e1e04061aa660ac2a9aee2e47aa1b4e
parent156de651c79698b1ab92d2d0fd7860846c9ace4f
Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle