Merge branch 'MDL-56448-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
commitbf639be2ef2a2bd206dfa6181ca494018fd6d70b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 15:06:21 +0000 (26 17:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 15:06:21 +0000 (26 17:06 +0200)
tree222f3e6a2cb88e83b9f4292d21332c7cbe4e64c2
parentc341f6ddaf2837ba46d89d12ebe2cfab05506d6d
parentf093a38342097017ea65796990cc40397394af76
Merge branch 'MDL-56448-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE