Merge branch 'MDL-54553-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commit54d3a2c4e49688df7d549ac8e8ac6a81e98759ab
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 16:23:59 +0000 (18 18:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 16:23:59 +0000 (18 18:23 +0200)
tree67eec242be071ccc491eb808667bf0c78ef3d6ca
parent995994ee75f4361320f5006a9f34dd3318455f1c
parent114c6918b6b63bfbbbdd43da9caad47e014b8285
Merge branch 'MDL-54553-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE