Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2015 23:24:49 +0000 (00:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2015 23:24:49 +0000 (00:24 +0100)
commitd687c29f269b9152fb4852c639127628e6e45f8e
treefcdd5f7a0ceb0acf4dbd84a661c2b0299128f2ce
parentd10ac16a2f4c4aa665ad6acb0abb40efe9b19ee3
parent5df7f1239878b83858220fd84c26e8c067712364
Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle