Merge branch 'MDL-48069-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE
commit3c8d8865a83e6677449648da94d4bd9086086c95
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 06:47:01 +0000 (7 14:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 06:47:01 +0000 (7 14:47 +0800)
tree1a47e8f622f5d4f879bd07cd770499f531af5424
parent91484edf1b8fbaaff25b05103c71a3d4e809e15d
parent2c6b80f4003ec67e52baa5f546ee3ceee0827e31
Merge branch 'MDL-48069-27' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE