Merge branch 'MDL-49114-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 03:29:16 +0000 (11:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Mar 2015 03:29:16 +0000 (11:29 +0800)
commitb8842bcdc77c7a92bf441d349354c6c287fc494a
tree0526845da1e8c0afba94ea819ec1183cd9d6e34a
parentbdece5fc278715cc4ecfff0ff5de2b4bcac8f24b
parent1bd4b9fcb443a086033bc328a2424f2a42ab83e1
Merge branch 'MDL-49114-master' of git://github.com/lameze/moodle