Merge branch 'wip-MDL-31952-master' of git://github.com/phalacee/moodle
commitd779cd65a97570781e2e49880f26b8d2bc13fe38
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:14 +0000 (9 11:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:14 +0000 (9 11:49 +1200)
treec14000601dfc6886035e83d2511ebcb212ae5a50
parentb370716f7bf885211237e68e1947343edb16ca4d
parentdd6ae1784c137b6268b1cbf79dc67ba057ba5fa1
Merge branch 'wip-MDL-31952-master' of git://github.com/phalacee/moodle