Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 16:34:48 +0000 (16:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 16:34:48 +0000 (16:34 +0000)
commitf957ec61caa2caccf8085e4566303d80b18f7e5b
tree2b443f954913e148505632d5e461f8af664e54f3
parentaffdc3b7e650071d579de3b267880fa78c28fff2
parentc905907bddb2bcff04bb8057881a47a83e42f60e
Merge branch 'MDL-43730-master' of git://github.com/ankitagarwal/moodle