Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 06:51:07 +0000 (14:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 06:51:07 +0000 (14:51 +0800)
commit890d8dbffebf95e4f1129130516ca7aaf6cbcdd7
tree0feb4780af59ee703051e440a3a0b2ba9e256c88
parenta2be9de182787610b71ac4c0c9a3f4c8bf79f486
parent704a8e5cb69faef82c54e6589feda85f3981c28b
Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle