Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 05:22:32 +0000 (13:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 05:22:32 +0000 (13:22 +0800)
commitd9ffe3f9450cc51d2f7c06712118941122e0e6ef
tree20ce83b051e3591a2f049cfe0f7b9150aba914df
parent8b4c865543a1058c4bd6710e8c96384e0c18f8f8
parent914077b4a818672da6bfae6abcd75fc75490ff27
Merge branch 'MDL-39611-master-int' of git://github.com/FMCorz/moodle