Merge branch 'MDL-57759-master' of git://github.com/jleyva/moodle
commite8be22337dce7430e320f416b097f7cc3d4cdd09
authorDavid Monllao <david.monllao@gmail.com>
Mon, 27 Mar 2017 11:21:35 +0000 (27 13:21 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 27 Mar 2017 11:21:35 +0000 (27 13:21 +0200)
tree19f2c45517bc14df368f0761f5649b4bfdef85ff
parent49ba56cf3839e03f7a7b890ea72e16d489247a11
parent2db90397f1ec0a49c63de14610bcb8afeff1aee4
Merge branch 'MDL-57759-master' of git://github.com/jleyva/moodle