Merge branch 'MDL-43679-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE
commit0aee829cd302b1db069900c599759f9b634c9117
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jan 2015 15:49:26 +0000 (5 15:49 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jan 2015 15:49:26 +0000 (5 15:49 +0000)
tree30e6d726de1665d437b99442809041f6d474437c
parent88929ca82476f85fd73fd3f0e6e4b0a86b3b46c6
parentb4e7dcaa8ac3391ad1e8ef73eb0bf55112c513ec
Merge branch 'MDL-43679-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE