Merge branch 'w52_MDL-43314_m27_floats' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Dec 2013 23:20:24 +0000 (00:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Dec 2013 23:20:24 +0000 (00:20 +0100)

Trivial merge