Merge branch 'MDL-21912-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE
commit2916c971cdfc4afc5742b5a27fe6c98b46b9dac4
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:08:15 +0000 (12 11:08 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:08:15 +0000 (12 11:08 +0000)
tree81ed8a2063868020f87acfaf4558e92ac474739a
parent2b2f987725e6dd5ccb7783b7598b69c25e68af4a
parent4a5fb82772aa4194788404323a8a65d4cd42e342
Merge branch 'MDL-21912-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE