Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 22:37:05 +0000 (10:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Apr 2014 22:37:05 +0000 (10:37 +1200)
commit6a90bc5e05af4e9f427db3c9446f63df4a32f256
treedfc00e1a1deb08dcbe4d0008cdaaac1589ffce1e
parentb983a5d8692e0e0d4df20d3bb861bd2df86500c9
parentac0f8617d4cd407f4ef04b8cbfc3fa277d5ea470
Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle
lib/editor/atto/settings.php