Merge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 04:34:58 +0000 (17:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 04:34:58 +0000 (17:34 +1300)
commitc2627cf429cbcde6abdd1c24fedeb4b7eb65709f
treeae695b8bd432af5933cb775c8740d4d70f995c24
parent5128ef6b452964b54ebbd9529abcc760e16b1f8f
parent55a573e5b07d7e8ca6f56e86c8cb878a1794f249
Merge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle