Merge branch '47077-28' of git://github.com/samhemelryk/moodle
commit578d905ec0b24da15348a9f16e27dd9f2adbce13
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Oct 2014 08:09:29 +0000 (23 16:09 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:08 +0000 (24 11:48 +0200)
tree12d5558b034ea8186e73bb953246d3ce92bff213
parent5dd0cb7bce882471359f50717946632819c4ff89
parentd5ae34a5a7540ae629739cebfdf1f6ab9a4542f8
Merge branch '47077-28' of git://github.com/samhemelryk/moodle