Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle
commit1e3dc6ed9cd39a822c2f74092ad79efb74afac2c
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:23:52 +0000 (23 15:23 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:04 +0000 (24 11:48 +0200)
tree6945a50ccffcb5c143e74d7c49fd51161426f258
parentb7840d478357edfe6946a1752f3ae2d856d03430
parentf01972d95e0e3cebe4263c68dd9fd7a18ab03a1e
Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle