Merge branch 'MDL-39068_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE
commit5ac9166740f9b23fdc994b6e4dba82467700e710
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Apr 2013 06:24:02 +0000 (15 14:24 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Apr 2013 06:24:02 +0000 (15 14:24 +0800)
tree6967938943f604fb8c2ade42263e765c5d55ba96
parent25105b650aa1c014e3296daf77673c59e5c7e624
parenta68e6026ca0fe82a14e66084911101b71539d584
Merge branch 'MDL-39068_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE