Merge branch 'm29_MDL-48567' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Dec 2014 05:33:54 +0000 (13:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Dec 2014 05:33:54 +0000 (13:33 +0800)
commitffb83efb312ed8e07e5dbad23d4c8058ede713c2
tree7fb55833d619e241573034f528b13388fcabf963
parent7eac77a51e0480856b7741c93b41140368f7a58f
parent64d00f4c113112900a2b3ef2d83ff2e42d7d4ede
Merge branch 'm29_MDL-48567' of git://github.com/totara/moodle