Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle
commit3d4de122f20830405b3e0d0f653c88851e5e2777
authorDamyon Wiese <damyon@moodle.com>
Fri, 7 Nov 2014 08:08:20 +0000 (7 16:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 7 Nov 2014 08:08:20 +0000 (7 16:08 +0800)
treef91b4a180a53c3cdbb03513976f6763826e041ec
parenta481e32f02cdabd2b76aaa06d1d513ffe480e71b
parent8c674e80ecad458b570098a5d4b35ad94dcb5ceb
Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle