Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:59:36 +0000 (09:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:59:36 +0000 (09:59 +0800)
commit82ee9604a2c0c46b9dd1673fd1a0cd04f6316ea6
tree89cd6eac22d4babbdf9a5d58d105b918d5f90364
parent212dc418d422018d256522a38aa0184a5a4f6215
parent487f6471a01e71841d7d75eb0ce414770d344173
Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle