Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle
commit3150271c2231567e5e63d8f8e0040fd1d827d9e9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 23:16:27 +0000 (10 01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 23:16:27 +0000 (10 01:16 +0200)
tree26ff562b78e05f4e7b2e1c7e1f63725a3a03c11d
parentd1b183b94bad1eaa73c17ea9bfafed51a6f33ee3
parent6e311b5fb303b8ee36a513bd33c40ed635b3f4bc
Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle