Merge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Apr 2014 14:22:28 +0000 (16:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Apr 2014 14:22:28 +0000 (16:22 +0200)
commit1011d704136d73f1dcc793649c02c4535f5538e2
tree3f642f35fa8f0c4cd89846ad66ddcf2720cb2185
parent287fc6ce68addadcb9e810db7b0801583971e192
parent218d751d0781a29ce5ef9c42feed91cba91bad5c
Merge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle