Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 19:50:09 +0000 (21:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 19:50:09 +0000 (21:50 +0200)
commiteafbd56da9038cd1aac2b06dd2200d476235bd41
tree3eb5d28a940d3b4d01f8e3be590dd986f848cf5e
parentb3d75528defa2f9d4b8fa1d54ec62a204241c82a
parente9e9b197b36269e26dd8018723a9c66e73acacfd
Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle