Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 10:25:09 +0000 (11:25 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 10:25:09 +0000 (11:25 +0100)
commit2ddcf272198af9f8c85037fdda198556343c7b43
tree98fc12016feb092bacd4f9afbac5336c487807b9
parentc12578d3a287a8977b6f9294993c754373cb8936
parentf8edef2e58a1f490c6afff4d47a03fdf61f14993
Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle