Merge branch 'MDL-54058-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 6 May 2016 05:53:07 +0000 (13:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 6 May 2016 05:53:07 +0000 (13:53 +0800)
commit729738d14c2f8fe49dd2fe84a199c07ea0b7dbdb
tree1ec5979322cba7b88d06b021d41ed96900ae16f1
parentd07c339272633411de517b119cf3288448930cbe
parent2cf9e3f0cae688fc9caec933eb9f6668ca8a6710
Merge branch 'MDL-54058-master' of git://github.com/junpataleta/moodle