Merge branch 'MDL-45721_master' of https://github.com/markn86/moodle
commitaf03e18f48975f1690e7f15df318863566017931
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:56:31 +0000 (24 00:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:56:31 +0000 (24 00:56 +0200)
tree944d932e9ea55549c0e2787fc66da0af6f7f001d
parentb362c8f90d7c26a28db8a6930b69a1c585cf9730
parentef03fb19aeed0de9d050b929e8f808f29c091545
Merge branch 'MDL-45721_master' of https://github.com/markn86/moodle