Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
commitbe5743f655877a11b458863e6b0c4686ce2d728f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Apr 2015 11:04:51 +0000 (1 13:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:08:18 +0000 (2 11:08 +0200)
treee4ce430a340fbbeb312099d74dc877b3d19e8878
parent82cf09885c33323161e2de597b1c9a913ba137ca
parentd4fdd3a1b0936301201fa80101e64831a2abaf5b
Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle