Merge branch 'MDL-40913_master-fix' of https://github.com/markn86/moodle
commit41244dd3cec905f03b49655445a158939b73c16a
authorDan Poltawski <dan@moodle.com>
Wed, 12 Mar 2014 05:56:46 +0000 (12 13:56 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:33:26 +0000 (13 18:33 +0100)
treef778b0190191a87512173979f6fb5cc60c584eae
parent06a241bb8db6ea106a1fbf05c6b39f3c0366e53f
parentf6a4a90e70568b495d5fd45793a886aaf4b012c0
Merge branch 'MDL-40913_master-fix' of https://github.com/markn86/moodle