Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 16 Apr 2014 06:42:15 +0000 (14:42 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 16 Apr 2014 06:42:15 +0000 (14:42 +0800)
commit2522b260e664f7e431c6d650a913aac24411e792
tree682869112543cf44b474671ace91741d1d5f4e10
parent36b5096e5917d99c2a1393dcee2f8576d6a7318e
parentf0ddce4df179efb5ee03fa7975fd7eaaf8477fb4
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle