Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:58:36 +0000 (11:58 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:22 +0000 (11:48 +0200)
commit065448834c8b5d6a2b88ba29b190e94968bed881
treebd3b7f84ea7318bbf9fe5990e345cfcf1b7bd453
parentfc91acc81384b45e7e870c92f96a29e9faa02e11
parent3275892c03f85d9e39115fe2fefda30ec1672292
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle