Merge branch 'MDL-49182_master' of https://github.com/markn86/moodle
commit6add8c594daac30ed50d3a1909aeca722aa506ad
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:38:48 +0000 (17 23:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:38:48 +0000 (17 23:38 +0100)
treeedfcdea279b6a502cc7f5abdf8f931a1861a1a50
parentb062cd5cb11a6eac8a9d70ffdbbb134188758978
parent5962f0df5d72771c3bc382c164fece592f642039
Merge branch 'MDL-49182_master' of https://github.com/markn86/moodle