Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 05:53:26 +0000 (13:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 05:53:26 +0000 (13:53 +0800)
commitee5c60c53a957c517549638317d1ac58caa35ba3
tree868e31d939107d697e521ad38af3c51ef9f8eda5
parent04c3fef12f81bc4236c5eaf18fd690a4a3d08843
parent920d3a95a19fc6591d4da6e73b2f25354f23b84f
Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle