Merge branch 'MDL-31036-master' of git://github.com/zbdd/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 Feb 2015 06:54:48 +0000 (14:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 Feb 2015 06:54:48 +0000 (14:54 +0800)
commit5ade288ab0ede162ea2c6486429d5ba195a0beb1
treec28a796eb7bb36233781a4a50dc1896585e5c156
parent3a0c9c6306571ac466d291339bccffec3b3ab6c4
parent75d08f02910c880ce13e2422a9bb40f5928a7a8b
Merge branch 'MDL-31036-master' of git://github.com/zbdd/moodle