Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 May 2014 09:18:04 +0000 (17:18 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 5 May 2014 09:18:04 +0000 (17:18 +0800)
commita7c1a5bcb59fddcdf338ebd62acba1d452828b8c
treea028bc1928c741f6034cf7a5c32c65474579dd9d
parent4cbe8be96dd927f9a51850e82b51c6d40cb2ccbe
parentad9353be73aafc1cba86c424255716f143587dbe
Merge branch 'MDL-44174-master' of git://github.com/FMCorz/moodle