Merge branch 'MDL-52014-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE
commit4c142669dcb063a76e0016eaa25e3f7df125f839
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 19:02:25 +0000 (2 20:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 19:02:25 +0000 (2 20:02 +0100)
tree7dedebe541bba0274b5f952d5e337a1e29bee3e0
parent691ed15ce25b8873054f23f7aa825e745d0c1768
parent7277f5a28e8b97e1ca25dc538cd0ca5792cd4207
Merge branch 'MDL-52014-29' of git://github.com/danpoltawski/moodle into MOODLE_29_STABLE