Merge branch 'MDL-48631' of git://github.com/jmvedrine/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Jan 2015 01:08:14 +0000 (09:08 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Jan 2015 01:08:14 +0000 (09:08 +0800)
commite653b9a4698bbe8266cb0989f85dfc52737e99df
treeb93eacac160d697aef543288796a593a889d41f8
parent44c3131c0835b76ba83f0b196d7d444bf072a170
parent2e6b9f5c9bdaceea578511a645a0d12f5b3a72b4
Merge branch 'MDL-48631' of git://github.com/jmvedrine/moodle