Merge branch '37680-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE
commit6f1cd6d47dbfe8b37b209149de1fd72213cf9048
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Jan 2015 23:41:03 +0000 (8 00:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Jan 2015 23:41:03 +0000 (8 00:41 +0100)
treea73da5ae9b24e4b1e2a408598572f8cfbb989d7d
parent25191bc31187f6381ad9fc690b653414ea3bc6d4
parentab36762b6d746e1b1fbed1fc0ada83a815648e13
Merge branch '37680-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE