Merge branch 'MDL-49911-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE
commitf8ef41211308512db3f1d6599b322d342a7ae10d
authorDavid Monllao <davidm@moodle.com>
Tue, 28 Apr 2015 01:47:01 +0000 (28 09:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 28 Apr 2015 01:47:01 +0000 (28 09:47 +0800)
tree563f1306841ba89721844809522305d5bdcd88cd
parent5ff4e7ad7be3bb894dfb3dae45d4b2cca167d6a1
parent2607a4e6714e5ad780d128e9f69235036b3de979
Merge branch 'MDL-49911-28' of git://github.com/FMCorz/moodle into MOODLE_28_STABLE