Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 21:45:04 +0000 (10:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 21:45:04 +0000 (10:45 +1300)
commite2f7da2a802c304569fe3192fe7c34eab5dc9718
treea4db304d569f53c5f20074cf9233ead5d438db04
parentd125c7d238d21295a13f40116401432ea2fae33a
parentb175341ed55d25a64e2305c9de029798ed3b6dc9
Merge branch 'MDL-34867-master' of https://github.com/tbannister/moodle