Merge branch 'MDL-57015' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:23:20 +0000 (20:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:23:20 +0000 (20:23 +0800)
commitf209d76b0d57386f22e666c8f955201eaf7af808
treefd42e50a55f9d8ffb48e18600b7983e73696629d
parentabdffed5fcac9f571bf974ef2b10648c60a9f2e1
parent7336ba40d5a9c36cc746b00e59a3e25ad6e1e77e
Merge branch 'MDL-57015' of git://github.com/stronk7/moodle