Merge branch 'MDL-47972' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 17:31:12 +0000 (17:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 17:31:12 +0000 (17:31 +0000)
commitfca969b9bb4d264956e9704c7b4dc054b492f481
tree0e67ee5ffb8dab4a98ba6f2600543db8b679c6ac
parentf31d564133108a1c033b4042b766178dbd9bcd15
parent77dca4d0a81b252969792e5e39a5671b4c20d98a
Merge branch 'MDL-47972' of git://github.com/timhunt/moodle