Merge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 17:58:53 +0000 (19:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 17:58:53 +0000 (19:58 +0200)
commitcd1d7c299396d1a2ed3337b9e34231d7e514da94
treea7a5289424631c3625581158be6c0fd1ae94bffc
parent7415646bcd51cb12fda030506bfd30d36d70503e
parent394ade5f2bd9a73dcdb7288ef6f927eba505f501
Merge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle