Merge branch 'MDL-47649' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:14:19 +0000 (13:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:14:19 +0000 (13:14 +0100)
commit3be2f6ac0b7fe6fe1bf107c5d7ad27ab47d4dfaa
tree4fab40fbed689403397f092424a821e71d559dfc
parenta1b152f5dbd3240e8d1ea09c8a1f9830bc6c4084
parenta866538b9b63562a1dc6fd80a6e7d1a7ad6b5c93
Merge branch 'MDL-47649' of git://github.com/timhunt/moodle