Merge branch 'MDL-51829-29' of git://github.com/dpalou/moodle into MOODLE_29_STABLE
commit45e41c4fbe6e6621ec862c913d4c3f2161798c10
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:40:50 +0000 (2 19:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:40:50 +0000 (2 19:40 +0100)
treede5ead09d305ba6f353a5d90fd52b77b528bdb36
parentfe8900c83e8f5e6070797d2d2c3c3d019b75a531
parent89e0f80a84d58aefede415d8d987c19047093b92
Merge branch 'MDL-51829-29' of git://github.com/dpalou/moodle into MOODLE_29_STABLE