Merge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle
commitdb6c48bfc10a2557571f5559b1eb1dbb681ea06f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:52:10 +0000 (23 01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:52:10 +0000 (23 01:52 +0200)
tree4a85097d7e465279ad25e2659ec5ca3e4b974978
parentec2ee188fcdf1d88aaf7e186c2a0899058bb1638
parentd5fcf4b42cc86df2d6a57e386e1d0e561e102efa
Merge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle