Merge branch 'MDL-48711-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 10:14:33 +0000 (11:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 10:14:33 +0000 (11:14 +0100)
commitec96b4b3d91e1cc557745c5e4e2aa4e016d9224e
tree62cc007ca727b27cff208b6cc557e7898320c4dd
parentb646a710bafa442ae74b770ad62a13a833a27043
parent3f874a9d24bdf47ab7c687e1a538254d621f74dd
Merge branch 'MDL-48711-master' of git://github.com/merrill-oakland/moodle