Merge branch 'MDL-49519_eloy_addenda' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Apr 2015 19:22:53 +0000 (20:22 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Apr 2015 19:22:53 +0000 (20:22 +0100)
commitc11960e4f05fc314ee91af9af8c0f797b0d9bc63
tree7f7132e876650dc862e04a08e484381f6bd0f5d6
parent17017ced9cb7706ea5807404309e9d82593e2067
parentc79054288544c02e65a9f2afe7be6c40ea21d11d
Merge branch 'MDL-49519_eloy_addenda' of https://github.com/stronk7/moodle