Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 08:47:07 +0000 (08:47 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:11 +0000 (12:04 +0000)
commit690a6341569d9b35ed7af32f33cf1498b0c4ab29
tree7db3d6250a63d9edc9594e57a25d43a4b68c4a8a
parent2852a9a0aa3cd3ab9f98a22d98a8b86c967a223b
parente07e04c123afdd5fbde4567dbe1bb9962c835b3f
Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle