Merge branch 'MDL-46676_2.7' of https://github.com/ikawhero/moodle into MOODLE_27_STABLE
commit6005337c331404f8567606de922c1853267b197e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Aug 2014 23:48:18 +0000 (12 01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Aug 2014 23:48:18 +0000 (12 01:48 +0200)
tree89562b6a2c28d38331c5d16c796575fb1052561b
parentea2833bc35900080dca5c76be5122841b2caca82
parenteee25b4a13751b2b8d5fbbb0071cc524680574a4
Merge branch 'MDL-46676_2.7' of https://github.com/ikawhero/moodle into MOODLE_27_STABLE