Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:13:11 +0000 (16:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:14 +0000 (11:48 +0200)
commit4ade5b11b21207ba7c677574e78d03d49087aaed
treed1b6cb93d64616dae175d3f5b4b79623dfb4ec50
parent4fdd69373bfc4ec74f43b0a0ec6a40d4608ac1ae
parent3e5a4c9047639936e766665a8fb4c8b5f591b96f
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle