Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 05:40:54 +0000 (13:40 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 05:40:54 +0000 (13:40 +0800)
commitb7e6b82155a69e44712ca8106d09a01755d9ddda
treef81af3e010b0681c192d6a8c74fc7fe9004c0c8c
parentaacd01f28e2b1a8df90ae21dbdd9e3649fb3f34c
parente696fe6aa5ddce9a0e69bfb053360e88a36d1232
Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle