Merge branch 'MDL-47813-master' of git://github.com/xow/moodle
commit4ea3258af9eae83497b105725a7aa41af2c93612
authorMarina Glancy <marina@moodle.com>
Fri, 24 Oct 2014 08:22:12 +0000 (24 16:22 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:49:18 +0000 (24 11:49 +0200)
tree7b1e451bb0e79cf85540481424f59c25729b55bb
parent996de187a53ef17c15ded795441159e9dd4f5c03
parent4809376f1351427f3628ae04b2f8f33f7bfe5ea3
Merge branch 'MDL-47813-master' of git://github.com/xow/moodle