Merge branch 'MDL-31589-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:17:39 +0000 (15:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:17:39 +0000 (15:17 +1300)
commit8f9c8186040fd2db1945b1a41c3f64bd224ff88e
treef4339e6155630768ea5a1f1ac0163edff9aee08a
parent1498035f37aa64f7c7bfc490e7a923f1b3e4bc6c
parentb9e7d8925e03afdeffdebdfc67c79f7a4e988606
Merge branch 'MDL-31589-master-2' of git://git.luns.net.uk/moodle