Merge branch 'm28_MDL-48907' of https://github.com/totara/moodle into MOODLE_28_STABLE
commit9e98e66cb23e9ecf4b0f8df081ba1d284bc685ba
authorDan Poltawski <dan@moodle.com>
Tue, 3 Feb 2015 12:56:44 +0000 (3 12:56 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Feb 2015 12:56:44 +0000 (3 12:56 +0000)
treeae3795de0ebd1b2a9c4445bc1eeb955f34db1fa1
parentb7f6f1c601bb64bfe8e7a5a72b1cc9a3b9d6f52d
parent044b68930890019a3ca1d35ab8b03c31caf0e588
Merge branch 'm28_MDL-48907' of https://github.com/totara/moodle into MOODLE_28_STABLE