Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:57:07 +0000 (21:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:57:07 +0000 (21:57 +0200)
commitabef633c33c944387a72e129f1a36ab57ee479f2
tree32b4ab93d846580598dc55075e43edc8dccd8587
parent5c34952b821bafc9c8ace3c43b00db9ad8947ec9
parentf8f37f1edc7935733ecba9f487fff67b0c144aaf
Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle