Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 03:08:40 +0000 (11:08 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Apr 2014 03:08:40 +0000 (11:08 +0800)
commitd767af7c2d9811700dc30ffb37b1d731531d3b79
tree975eed341616fac47b70b151a2f96e4cbc2d83d3
parentc390774adeab7fb4640355064b9d1e17c935acb5
parent87c0e4e06baab7592cac5f66592ed66378e4b91c
Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle