Merge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle
commit2c6401e3a9c080682b21de26f1bfa57f835b71b4
authorDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 07:22:59 +0000 (14 15:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Apr 2014 07:22:59 +0000 (14 15:22 +0800)
treef0b707e05435a9968a874918cf3a54354b1d549f
parentc6758994255e24c8de2e9e6bdb05012f07e62c35
parent0ee4ccb636495396cf4de94beb78d7d5e571aa18
Merge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle