Merge branch 'MDL-50408_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 13:49:06 +0000 (15:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 13:49:06 +0000 (15:49 +0200)
commit4a85f8dc16788bc0982fb01e630327ef06aab8e4
treeb51f74917057aaa5ff629465bd07ae4ba39e5e3a
parenteec5902cd6a721c747d5ebdc9457b5580d0cbc73
parent5c73688b4a098bbd1ffa52e9410822beffa44951
Merge branch 'MDL-50408_master' of git://github.com/dmonllao/moodle