Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 22:36:11 +0000 (10:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 22:36:11 +0000 (10:36 +1200)
commit3b31276bc8ebed7a1683e1decbadd808f0041cae
tree24b73fe4d46bcb00620f6401473b0b870892a811
parentbba9c3bcf883538a38503fbaef9cf1cdc353c5fd
parent0d1d5423327fccd30a1f7e1e4adacc61de250875
Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle