Merge branch 'MDL-34671-m' of git://github.com/andrewnicols/moodle
commit8d8e6b151913d69ccd927d683f881fc0bfa960b7
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:39:35 +0000 (29 08:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:39:35 +0000 (29 08:39 +1300)
treeffcad9ba9076c4a932015cae56d39bbf05201861
parent44aad1234792cbb835f7a67bc70f07fb83fb92f6
parent8a185b9ebc4ca891a4149009f3630d3dcf48ab06
Merge branch 'MDL-34671-m' of git://github.com/andrewnicols/moodle