Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE
commit9e32e3befcef51be950282c24c03174986b14005
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 23:12:13 +0000 (22 11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 23:12:13 +0000 (22 11:12 +1200)
treeb2a04eb7b210fffcdc2fb9a8db2aa6742549b767
parent695553b1a5dae515c0577c62d45a239aef63ee63
parent23aab8e6941b17c08cf1bef4795ca51fe49dce15
Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE