Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 17 Feb 2016 01:49:04 +0000 (09:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 17 Feb 2016 01:49:04 +0000 (09:49 +0800)
commita6f4866e52c61bc4ae14d13f1fa116f99dfb223d
treee864788d331eb19b7aa8a841daf4b2d960428163
parent45cb6145fb8f46e08133e04d36d0a7df9beb3521
parent825a3fa9d1ad0fcf627099407d46cc844ca805de
Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle