Merge branch 'MDL-48914-27' of git://github.com/rtcn2/moodle into MOODLE_27_STABLE
commit1ffc4059365b3fa5eb2ee40f057522b070e2283f
authorDavid Monllao <davidm@moodle.com>
Wed, 28 Jan 2015 09:45:01 +0000 (28 17:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 28 Jan 2015 09:45:01 +0000 (28 17:45 +0800)
tree3c8de3eab6fa49f24c62660b9426f1f79e95be16
parent0289be1321babfa588fb5b18ebb08a296eed9eee
parent73841c3908bb19d952352c024fc48c77a6865b42
Merge branch 'MDL-48914-27' of git://github.com/rtcn2/moodle into MOODLE_27_STABLE