Merge branch 'MDL-50685_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE
commite544b6b02a9d552c7d622f75ebfe8a4d90e8de2d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 00:16:27 +0000 (16 02:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 00:16:27 +0000 (16 02:16 +0200)
tree845aa8dc6e159b97ba1c39242dbdfca62bba9947
parent204f6198def3fdd928ba636520ba3c56797fe36e
parentee7300f6e6c7ec6684fe2e8dc1c136c308b3df1f
Merge branch 'MDL-50685_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE