Merge branch 'MDL-52567_M30' of https://github.com/nadavkav/moodle into MOODLE_30_STABLE
commitf41a364e27f4fa99d2b8603380c3a723e2718b74
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jan 2016 23:37:23 +0000 (27 00:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jan 2016 23:37:23 +0000 (27 00:37 +0100)
tree612a18271420a1c48bd27bc09e82c965f4c3ea02
parent33cd0e15f18a9d68e096896d6be3d7c5fd6d3c6d
parentcb61fdd961cbb7c658116f1b58c26d7f1db452fb
Merge branch 'MDL-52567_M30' of https://github.com/nadavkav/moodle into MOODLE_30_STABLE