Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle
commit2e6b251de282a11f33af7d54f6309dc0afd7b5b2
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:26:38 +0000 (18 10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:26:38 +0000 (18 10:26 +0800)
tree2077c12edbd1fd3dc958c16099b2646d15e8069f
parentaf80f7b4a5a59a2e8e90691cdeb91d5e846a02f8
parentda223c11a55c5990285e395032fc53f29de9e39e
Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle