Merge branch 'MDL-53369_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commiteb7715d16fe14f6c608ade2431a98e897b6af019
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Mar 2016 17:59:45 +0000 (9 18:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Mar 2016 17:59:45 +0000 (9 18:59 +0100)
tree2d56b50ce6ba34595ff39d93d971c5d84222f4e7
parent4db8407d3eaba17a8d3f81957b8e93e9f2554055
parent0c5c778ae7f3797812552610c9abee2d0716714b
Merge branch 'MDL-53369_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE