Merge branch 'MDL-32616' of git://github.com/timhunt/moodle
commit96ef0378564281f838cd375dac7394f4072306db
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Oct 2014 04:02:22 +0000 (23 12:02 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:47:59 +0000 (24 11:47 +0200)
treeea7294c37741c243026848e44674d3f36c9b696e
parent7a811fb63aa35d6ece3d90094d4740e866dee137
parentcf256c05d852cb470d8623410a013005d1e1385d
Merge branch 'MDL-32616' of git://github.com/timhunt/moodle