Merge branch 'MDL-58030_32' of git://github.com/aolley/moodle into MOODLE_32_STABLE
commitf1a117b86b189fed0e02a99e82b2fd330cfd93cb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2017 21:47:22 +0000 (27 22:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2017 21:47:22 +0000 (27 22:47 +0100)
tree2c042e402b3e39b1dc6e6679387fdf2f2211265e
parentb7d36bdbaf9a0d8cce06a27a8bedafc699bcadd2
parent9ffcf8a3e91ed618ba52480999a53aa6282a0695
Merge branch 'MDL-58030_32' of git://github.com/aolley/moodle into MOODLE_32_STABLE