Merge branch 'MDL-43690' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)
commit395333abe9dcfdef1becbd87cc1246079bca197d
treeb7d0e0b07350a08b61695fd51ae9785a3ccc1379
parentac97a7ed53c9f51d707b4995a559664c689e1037
parent7051f3a8828665f4fab37c8db91322fec85a64db
Merge branch 'MDL-43690' of git://github.com/timhunt/moodle