Merge branch 'MDL-52388-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Mar 2016 21:14:06 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Mar 2016 21:14:06 +0000 (23:14 +0200)
commitd4f69a462e007215cbe1d34734bd70a0ebc9e847
tree2ef9087b7e77319d425563ad5951601764c0f3e2
parent0729ea9fd74ac9e326f66a10d8a77fb3e4a59c90
parentb31bbcf8398a805aa05a00fc2955885b3de2d346
Merge branch 'MDL-52388-master' of git://github.com/cameron1729/moodle