Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 20:58:53 +0000 (09:58 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:20 +0000 (11:48 +0200)
commit1e9756971359751ab117a8d9fe7ba03f5b1dd15a
tree702bc0ea7080828da46a34547cc961aa58f16f9c
parentee19ae694a671cafd3698e9c2ab0ab2991b9919d
parenta024eaa5fc33cb2b64e806ef7acbcc2030e1c61a
Merge branch 'wip_MDL-47795_master' of git://github.com/gjb2048/moodle