Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 22 Apr 2015 09:02:19 +0000 (17:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Apr 2015 09:02:19 +0000 (17:02 +0800)
commite5c5ced9120cb1f2f65110766c3aee0fd27fd858
tree96b6f4eed89872af19506fd6dde8d908eda7b93c
parentac0f0f9dd93d0b49879f61533e53ca692d7e4e33
parent2224f2c5989104defbc6e8ccb1109b14e5fe98d4
Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle