Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 07:08:13 +0000 (15:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 07:08:13 +0000 (15:08 +0800)
commit576abe8f3979ef090ff8687d4773be512b87967a
tree96d6ba3b9d4d152d8c242fd81cd9ddddb80a759e
parentc966d2e8c8114d45c961c0d9400a2327133b3a1d
parent1389bcd7e60541ceb95131440b7541c7ed647e8f
Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle