Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)
commit1c647a4473d0d17cbc972c6b191cf271d21b6a14
treefbf0d73bda66fa6513124bbaf8011b6b49ab63b7
parent190ceae64b4ca080214ce458716012812f9fdeea
parent94e15b35145258833aebc29bd579a15c3cae6bba
Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle