Merge branch 'MDL-55162-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 18:35:50 +0000 (20:35 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 18:35:50 +0000 (20:35 +0200)
commitf60a16ad9ddb315259a131a183d00742d0312bb5
treebb9c5228908286117c6d374249729b5a44c719b6
parentd66e54b02168e230cac2235bd771e81244dacba0
parentb93ea100fc34d7116081ab20fcf6f6387bc74711
Merge branch 'MDL-55162-master' of git://github.com/jleyva/moodle

Conflicts:
mod/assign/externallib.php
mod/assign/db/services.php
mod/assign/externallib.php
mod/assign/locallib.php
mod/assign/version.php