Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 20:54:36 +0000 (09:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 Jan 2013 20:54:36 +0000 (09:54 +1300)
commit9d98cb9f176c51c717d935b380dbe485ced72ae5
treec12fc08539a6e12d028bf785fc6779438cc2876d
parent5afd8bfedee694a844377c84212eb4f953451d28
parentaf7e05d6ccac3b7242972c1c40a3e44c3836927e
Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle