Merge branch 'MDL-29771' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2015 14:13:18 +0000 (16:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2015 14:13:18 +0000 (16:13 +0200)
commitf0fa70d0df1955816c5cccfb3e35bbc8aa4a01b2
treee2a9539ee03fd42f39bbefeaf54fe32bf5e49839
parentdf0a584485ee25a67e2f4e57b52284c2cb48f803
parent3af05ae35b627bc35c01c81fb16395d7e7f3d588
Merge branch 'MDL-29771' of git://github.com/timhunt/moodle