Merge branch 'MDL-48914' of git://github.com/rtcn2/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 28 Jan 2015 09:44:05 +0000 (17:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 28 Jan 2015 09:44:05 +0000 (17:44 +0800)
commit17031f764fd5625d2282943466087095ca965b92
tree175b27d461acdc02fd792fdb8befcc6222f49104
parent06c2753115f3a43a4c6c8ad50931039e453ca31e
parent2350e7f24d64eff1f7070a3b5183b90925f62708
Merge branch 'MDL-48914' of git://github.com/rtcn2/moodle