Merge branch 'mdl-53133-m30' of git://github.com/deraadt/moodle into MOODLE_30_STABLE
commitff1cbbe51fbac4fff0323054f223f838e82649e1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 22:53:48 +0000 (15 23:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 22:53:48 +0000 (15 23:53 +0100)
treede2caad885c307d599ee703e0687ed6dc9f5c64a
parent5dfd5066c04a0ce1491e78fa1ad676fe6fcfe0e4
parent99a895b7c3f9337b68f6b2add2377429fde734de
Merge branch 'mdl-53133-m30' of git://github.com/deraadt/moodle into MOODLE_30_STABLE