Merge branch 'wip-MDL-54666-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 21 May 2016 10:36:51 +0000 (12:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 21 May 2016 10:36:51 +0000 (12:36 +0200)
commitcd1c8d213252d23ff672c83b0004c81e0422770f
tree1e35f557e72c3c8e3d3a785228a432ecdcbec770
parent446e0299b9210f4d0fd4a29355d505b1483b2093
parent4ca17b63a13d06ddb3673ef2ccbe61425eb99ff0
Merge branch 'wip-MDL-54666-master' of git://github.com/marinaglancy/moodle