Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE
commitd5cb1a40966f9bea25173c97adb7bac2c3e94597
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 22:10:13 +0000 (2 11:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 22:10:13 +0000 (2 11:10 +1300)
tree7c6adcb8fb994c82d9ff5c9612b39303dd43edcf
parent4fd7c545cc321d59997d4b0d2b1e93f5a41150ed
parent8ed9c72991b71272e1a2b1ec36ccab7aa5942ae8
Merge branch 'm22_MDL-35472' of git://github.com/totara/moodle into MOODLE_22_STABLE