Merge branch 'MDL-58177-master' of https://github.com/sammarshallou/moodle
commitd4a8fb899a382112bc29884ed6e0a4ed0317f903
authorDavid Monllao <david.monllao@gmail.com>
Tue, 28 Mar 2017 21:16:42 +0000 (28 23:16 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 28 Mar 2017 21:16:42 +0000 (28 23:16 +0200)
tree8dd3511474a3d69dd817b16d03af93221e0df9bf
parent46c6d0df5a0b25391693f679c2a9609dc1f88048
parent832a18a46ada32a0b3f2d99d4f2c403daf7f3a5f
Merge branch 'MDL-58177-master' of https://github.com/sammarshallou/moodle