Merge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:28:44 +0000 (14:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:28:44 +0000 (14:28 +1300)
commit11e95000bd98652488e0f729254468d30a6c97a3
tree14837649b9a4fe2147080acfb2340d5a60f95313
parentd60ac860ea9af8db0c28bc679687246f754af6d0
parente907c685308813371243a95f2a019873ff480b9c
Merge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle