Merge branch 'wip-MDL-44501-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE
commitad94e63238b5165298149636513260f42201f12d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 16:59:22 +0000 (9 18:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 16:59:22 +0000 (9 18:59 +0200)
treecafd9fa2e625fe78fdaecfd0fa5149baa07fc8a9
parent4524454ff29725ddfdc168136ada2a7d90c5e965
parent0a1f0c4b1fd9385ba184f9f35a03295a06b12c07
Merge branch 'wip-MDL-44501-27' of git://github.com/abgreeve/moodle into MOODLE_27_STABLE