Merge branch 'MDL-52899_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commitfec7104bec9dafecc86603dc8bc9cc199765bd98
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Feb 2016 05:45:07 +0000 (3 13:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Feb 2016 05:45:07 +0000 (3 13:45 +0800)
tree49c144df5dc2d3409e16d29acd4d341fd5e078c5
parent008fd8869c392c1076839b5eb7729ebb0358045d
parent86560bedd1ab9858a2c0cf1dbfbf2be82c98cc13
Merge branch 'MDL-52899_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE