Merge branch 'MDL-51495' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:56:27 +0000 (16:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:56:27 +0000 (16:56 +0100)
commitfdca1a1dd3652273fc3edbf7a4137cf297a6ef11
treea04431a25bdedfb3fb4acdbe4dc8c1d4fe10ff46
parent02c72ecb79d5e3ef383c2315ace34163e9320f7f
parentf11fdf9c98dd565820586dc7a9ef9c46d0576aeb
Merge branch 'MDL-51495' of https://github.com/NeillM/moodle