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