Merge branch 'MDL-52661-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 12:56:09 +0000 (12:56 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 12:56:09 +0000 (12:56 +0000)
commit149ba5c227271eacc4a18482774044e258c0c6b8
tree0820da4ba7f2fee3336b94d05bc57898a634b2a4
parent73c2ae931d2b6776aca9860d77d959656588be60
parentfb43a326c2dcdef8433edc4f0fa2f452d1958584
Merge branch 'MDL-52661-master' of git://github.com/junpataleta/moodle