Merge branch 'MDL-47646' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 06:26:49 +0000 (14:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 06:26:49 +0000 (14:26 +0800)
commit1a847ddaf85aa096d140c91342c8cb58e66e9b8a
tree546d22b7080c4d89bf99f7efa9b77c00808bd31d
parentb51c2c4f8c322793d6e4a4f75be3cdd3e8b7a742
parent90048c7cfa88843cab4d6bc8eb47a032785c7cc5
Merge branch 'MDL-47646' of git://github.com/timhunt/moodle