Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:40:16 +0000 (19:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:40:16 +0000 (19:40 +0100)
commit373748277a511b71f1d9a9b1effb54c9d8452db0
tree98a872dca2c1cd38e9f60ce3f5403de2a21d964d
parent28aadc2b126d9bf8aca7029fe0fb9f86a10b282c
parentdbcade703b82df7509e1d102b88bdc3f259c0495
Merge branch 'MDL-51829-master' of git://github.com/dpalou/moodle