Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
commit28fef14840ed48687e07986a32ab972e430a279b
authorSam Hemelryk <sam@moodle.com>
Thu, 10 Oct 2013 03:06:40 +0000 (10 16:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 10 Oct 2013 03:06:40 +0000 (10 16:06 +1300)
treecedb50f3abb9b052f694d75b5db70957a175bf25
parent370058d8fb9316a391b9cf15b375c64469ee794e
parent53d79266b9b2d28d113b580499bb379390dea2c4
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle