Merge branch 'MDL-57407-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 08:33:30 +0000 (10:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 08:33:30 +0000 (10:33 +0200)
commit0500bc49f19ead29a7936b2b41dcbd7d8b52616f
tree578a98c2758c94901956baf3df7e0c20c6e561d6
parentd887e98b567c1ddc876961257bf7037258ae0ab4
parent84c50d1cc48ff4983efa2cc0b327ba94b0ee3434
Merge branch 'MDL-57407-master' of git://github.com/jleyva/moodle