Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle
commitcb4b46f45c197961fc199648f914af47b738cbd3
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:14:45 +0000 (16 15:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 03:14:45 +0000 (16 15:14 +1200)
tree0c0ee8f021de3d1dc49374f6efd14f84d19e7267
parente3d34313ab95b1ea1157906fc636980219a39a9e
parenteba9236ceaa5c497847033cd62b96794a4c3633a
Merge branch 'MDL-32353' of git://github.com/merrill-oakland/moodle