Merge branch 'MDL-57524_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 01:24:08 +0000 (02:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2017 01:24:08 +0000 (02:24 +0100)
commitb4472fb4592b883533f1abe22e774ce57af7f0c8
treef0b53c511bec3f70cacec87e41beff6272287c82
parent06fb1df811e7761a0cd316481c0e92a31f012ed1
parentf9c1a7515a677f73f17b1145662bd8acd4bd1ec5
Merge branch 'MDL-57524_master' of https://github.com/nadavkav/moodle