Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:22:12 +0000 (11:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:22:12 +0000 (11:22 +1200)
commit08e0aaa1733489cee61b1c48e166a98ada4477cb
treeee97742f72ae484adc58e85e265eee12c65b048c
parentc31081d0a46d4c8a89d61dc99a6f47d994e2f3ec
parent5f73d19ddd43fdf6505b94481698f6cb6d126078
Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle