Merge branch 'MDL-45818_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:15:24 +0000 (15:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:15:24 +0000 (15:15 +0800)
commit0908474990bfffd9ac9460e6611fd57b2ac5f0c0
tree0b297145fb2f19e8792a552235b0ec03ca8b4a93
parent181435d483b5673c398171b164e2e4cc09393c86
parentcbfd685a7e32b6a0c793824c6fd441411b5dcc2b
Merge branch 'MDL-45818_master' of git://github.com/markn86/moodle