Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 17 Dec 2014 00:52:58 +0000 (08:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 17 Dec 2014 00:52:58 +0000 (08:52 +0800)
commit92f54681798f8a4807d189e9ef2e256653514f43
tree0ce2298d9164f752d081a3b36f8069a27897afbb
parent861265b43a1870899fd471c21f8bf022d33c4ae2
parent60b57b618967587a6d49e3332328dd74350dd186
Merge branch 'm29_MDL-48482' of git://github.com/totara/moodle