Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 20:37:19 +0000 (09:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 20:37:19 +0000 (09:37 +1300)
commit469c32955ac25f72b7eafab2e08a9e6539bab420
treee848cffdafbf1f12ba05ab81ac3f685fe70f9a3a
parent756350b82d0267217d34a9acf087326bc7919afb
parentd931574ff9cdd24aa8db719ceb3cd5eb78049e38
Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle