Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle
commitb7164a5c21414daed7ced9f1b4c25454f829b6a4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:09:38 +0000 (10 01:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:09:38 +0000 (10 01:09 +0100)
treed7bfeb7f5084ea4283e07685ff6c38472b5f1a40
parent8bcc97f0560729ef05a028e08a501cf1e525773b
parent4966123edc57484e90073700eefcd6f9c0aca9f9
Merge branch 'MDL-48964' of git://github.com/jmvedrine/moodle