Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 23 Oct 2015 10:18:08 +0000 (12:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 23 Oct 2015 10:46:53 +0000 (12:46 +0200)
commit2ee86365530e39d9d6f6285b0c8a3789293aa7de
tree5d1be38814d516cfbed332ff2b2674bb082dbce2
parent8c976328c1f4e4efc6fd006880e7dc3e324f9ff2
parent5164b76e7527422ff4d697626d6e46acb4625593
Merge branch 'MDL-30674-master-wip' of https://github.com/andrewnicols/moodle