Merge branch 'MDL-52938-29' of git://github.com/marinaglancy/moodle into MOODLE_29_STABLE
commit75f61371a01050db08f12f9584eb9802c272e3a0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:30:57 +0000 (9 00:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 23:30:57 +0000 (9 00:30 +0100)
tree92f6ea58b6f685b265f3dbfe88d4392232e5e07f
parentf78700dc472dd08c9f459b7aa73545fd83ac29bf
parentb0ab1806660d1d858669cf4fd49a2f914613d26d
Merge branch 'MDL-52938-29' of git://github.com/marinaglancy/moodle into MOODLE_29_STABLE