Merge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle
commit5077d63790d019ec46f79f12f2571f05f7d5f53e
authorDamyon Wiese <damyon@moodle.com>
Wed, 30 Apr 2014 08:37:53 +0000 (30 16:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 30 Apr 2014 08:37:53 +0000 (30 16:37 +0800)
tree920a61667f62acf0968e82a1e740be08b991ac63
parent954e15bf271db88be4333a2040e1c35848c26bf3
parent8e937d25d029a59dfcac6dd934ebf6b62ab3a472
Merge branch 'w19_MDL-45262_m27_choice' of https://github.com/skodak/moodle