Merge branch 'MDL-48991-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 08:42:51 +0000 (16:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 08:42:51 +0000 (16:42 +0800)
commitdfdb99d9d5c83bb231995ced730b2d0c3d00f2fb
treedd2d6c30db0c93cdd58a715ec0e269080920068d
parentd90879791837493c9109d9ac108bf1a7f8fd53fa
parent502aa0fbfdef574b5e30bb93e8d71528390b7b21
Merge branch 'MDL-48991-master' of git://github.com/merrill-oakland/moodle