Merge branch 'MDL-48004-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commitf248c81e5a6fb570b50aaaa1a62facae92134494
authorDavid Monllao <davidm@moodle.com>
Thu, 3 Dec 2015 04:52:45 +0000 (3 12:52 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 18:01:47 +0000 (3 19:01 +0100)
tree2105f8d7ec957c3c8a9326e038ce85a23856662e
parent7d05696b12265a58ed807748a280d8d0335540a0
parentb1549e4127d592aff0a77ca20c8f343ea8eb4f27
Merge branch 'MDL-48004-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE