Merge branch 'master-MDL-49750' of git://github.com/jojoob/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 01:28:03 +0000 (09:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:26:53 +0000 (16:26 +0100)
commit86c48d177e48780d964489cb81ac88005c11315c
treee550c2d00711b4ae592e038e80746f55e9a136a6
parentc6ce30bb3ff572761f6b974c5e1e3d9aaa83bd01
parent8c3b27d4b24aa5a573b0d581b1aa2bdb2763ed38
Merge branch 'master-MDL-49750' of git://github.com/jojoob/moodle