Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:40:56 +0000 (20:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 18:40:56 +0000 (20:40 +0200)
commitdb91aae8f465add7198d102b22e6bb43954aa6f6
treee9e74161feffd06f2d279753fab2b7576a9f0da8
parent7d91e86452c374fc532e6577425d72f3196e0853
parent1254e48f26f5d14852d587082a5fe5b9ed6d1cdf
Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle