Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 01:53:53 +0000 (09:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 01:53:53 +0000 (09:53 +0800)
commit0d474cb2b4986e034d6c0a63c4ffbab27df36944
tree2d98672397d312a91017b6136bd9e644af20ddb3
parentec39530d5fd6ac6ca192e19e50be0ebd6cdc3fc4
parent1e31f1185232e51e0d660ec5ff8ba72b59e023bb
Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle