Merge branch 'MDL-48004-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE
commitd69efaf872be1905094557ce5b7f72551114ce0b
authorDavid Monllao <davidm@moodle.com>
Thu, 3 Dec 2015 04:52:58 +0000 (3 12:52 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 18:03:29 +0000 (3 19:03 +0100)
treef51ce32ef162dd7946080778bcfb50f52f3daac4
parent3e7d409d721578862cc50a6fd249fcb2c3e9e470
parent1199aab2c1bde9e99bceae09ab1218c9f47a25a4
Merge branch 'MDL-48004-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE