Merge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 22:09:51 +0000 (00:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 22:09:51 +0000 (00:09 +0200)
commit40f1dff05f3065b6533886eb1286178e1a517c3a
tree9ad8d7107efd0f65074d4ba883aba2a8465a2710
parentf438b03fdcefd1f431500485c3e7fcb589258e20
parentf4774f44d181d9484d404bbdfc380608187ac2f9
Merge branch 'master_MDL-46816' of https://github.com/danmarsden/moodle