Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Nov 2013 05:10:44 +0000 (13:10 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Nov 2013 05:10:44 +0000 (13:10 +0800)
commit0fd6069ecd81eee278e54bebc3d32e1e191653a4
treea60e7d0d4a2d75f6d67fbb221f86825de978bee4
parent138e71a42e3c5edc6cf9d7b404ec08c34efe7c5c
parent5b1944bbba57f4a077d1ff2db32345d298209ab5
Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle