Merge branch 'MDL-48855_master' of https://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Jan 2015 11:41:06 +0000 (12:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Jan 2015 11:41:06 +0000 (12:41 +0100)
commit74bc0178ea4a059ff7923e4e1da058aa9c3999c0
tree7f7fe473e4629aeb3f25318ef5f6934439f00bf4
parent941ea6b2ffe308a3de7324280215dd1cff722360
parent38535ab8917f025b591cce6fed50f34f45214c78
Merge branch 'MDL-48855_master' of https://github.com/dmonllao/moodle