Merge branch 'MDL-46753-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE
commit2e97e57edb50cdb6adc1b78ce97ae262063ded36
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:08:17 +0000 (26 02:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Aug 2014 00:08:17 +0000 (26 02:08 +0200)
tree3b92c38c1231b7f1b2828b1497a1463a5f36855c
parent2f64ea2a2ebd7b5c9efe7c92b3a563040e574234
parent068ef548de7373247849caa7702a7a2ca34e13d7
Merge branch 'MDL-46753-27' of git://github.com/lameze/moodle into MOODLE_27_STABLE