Merge branch 'MDL-43423_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit6cb311f306110cee749190bc49f663f53817e7c3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:03:16 +0000 (8 02:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:03:16 +0000 (8 02:03 +0100)
tree7cc24f8ac7294a79799b240727da6cb9499c8146
parentf9e99683f76f663eab95259839dc5c11abd0b82d
parenta0735059b591f6b34eb5a2c35e14c91dd7787b7b
Merge branch 'MDL-43423_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE