Merge branch 'm29_MDL-49904' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 02:40:37 +0000 (10:40 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 02:40:37 +0000 (10:40 +0800)
commitb9476466f12a2992f26adbfc9513face6f9ee6f2
tree7080ffc30c94b5a3bbe1f04666f83391aca11efb
parentd302ba231ff20d744be953f92d4c687703c36332
parentcfff4da9f612520a36d6c37e292d2ad8757aefb3
Merge branch 'm29_MDL-49904' of git://github.com/totara/moodle