Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 30 Apr 2016 07:39:16 +0000 (09:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 30 Apr 2016 07:39:16 +0000 (09:39 +0200)
commitb22692d7407c8b4eec67f7604cf488c75571603c
treea738f609fb6b687cfd4efbd10d5486b5c0e8203a
parent3219a4535ffb4685d9d7182f62bbee481af78805
parent9031371211bfbd1aad26cce5dd27a754fabe5d4f
Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle