Merge branch 'MDL-48778-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE
commit870953541cc60280a01174490ee49f885abfb414
authorDan Poltawski <dan@moodle.com>
Mon, 8 Feb 2016 17:15:45 +0000 (8 17:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Feb 2016 17:15:45 +0000 (8 17:15 +0000)
treee359e9e4c3545dc1829ad0cfa3986b4b6e4878bc
parent25c6437296ebfaee015cb1701af4a1e2272a4cd1
parent5ff2c7d8a62a0ac69f42f1bfa567d90e8e4d581f
Merge branch 'MDL-48778-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE