Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 04:30:55 +0000 (12:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 04:30:55 +0000 (12:30 +0800)
commit1ed6bd87a2daa023fa1f21b96eefca70b976be71
treea36b113062169aff80537391a83fd437d89610f5
parent25de7d88e76ce74b95625baa5ce771600ac0299f
parent90a3a62096893d000156965f244b915ef87df924
Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle