Merge branch 'MDL-35078-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Jan 2015 02:35:04 +0000 (10:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Jan 2015 02:35:04 +0000 (10:35 +0800)
commit5b97de39f1917e5f7183977b8fdf9390021e4ff9
tree5bdbb37b11bd9ed725c4d6bb186f657b61733d5f
parente653b9a4698bbe8266cb0989f85dfc52737e99df
parent900a559a3c0f54e9ae0aea033e189a1bb9abba56
Merge branch 'MDL-35078-master' of git://github.com/danpoltawski/moodle