Merge branch 'MDL-48823_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE
commit5bb19510aba03592bba1c100475e4b9802940b33
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Jan 2015 11:32:39 +0000 (21 12:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Jan 2015 11:32:39 +0000 (21 12:32 +0100)
tree3e8d0f6d202a02656149c4095c668a38f110a5f1
parente47d85fadb7dd3548d5578ecb3b2dbd695d865ec
parent90ef484cecd8da446e06957b99a7681f4d689b0a
Merge branch 'MDL-48823_27' of git://github.com/dmonllao/moodle into MOODLE_27_STABLE