Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Dec 2014 05:44:01 +0000 (13:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Dec 2014 05:44:01 +0000 (13:44 +0800)
commit486ebeb1a4e30d7c989a2d74321d1e43b1e4c888
treeb19fd0366362ba6d4bafd40d05bb1784cabd33c1
parent8f06fffbe117b91bc0c36c78a25210c994fb0a20
parent831829ddf303675f9454b3f186e28244ddc3b24b
Merge branch 'wip-MDL-48347-master' of git://github.com/abgreeve/moodle