Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 01:56:21 +0000 (09:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 01:56:21 +0000 (09:56 +0800)
commitf966af0da3c9f4011db400fe69a53009dbee1e0a
treea0b1737b05f7a612072e9c64e910dfc84a7e3eb4
parentbeaceef9ee8e5607cf2dda66af7b1c0fb5738a20
parenta75a381f0469098f95ef53c0d8f62b755c5c17d1
Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle