Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Nov 2013 06:52:26 +0000 (14:52 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Nov 2013 06:52:26 +0000 (14:52 +0800)
commita184b3d71234a7db453990df1daf9307b33e3098
treec19f97ebe33f3d5756aae6d0dec2d77286d8b5d6
parentfdeb639eb8e5ed8438df86493582a6e11c6727ea
parentba72e295c226644b897ad9b0f04cde7ebc2d3d21
Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle