Merge branch '23178-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Dec 2014 23:06:46 +0000 (00:06 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:28 +0000 (12:14 +0000)
commitfca0b79d185ac50a0aeb7ef6ce6684b88b8a463b
treefaf80239ed6711207d51ece214f7064f3f90b58c
parent101348192bf03cc3cb1ac99bb4a5220e219307c9
parent5d795b5717402d71108782f7ff1c04907c13a141
Merge branch '23178-29' of git://github.com/samhemelryk/moodle