Merge branch 'MDL-25138-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 13 May 2015 02:23:01 +0000 (10:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 13 May 2015 02:23:01 +0000 (10:23 +0800)
commit51062c52cb86d765afc2fea253de696c5d4dca40
treeb5480b6947241d22a24e68d0252efd291d3efe27
parenta17d9a6b99bbe9556a2e703daa2ef83dc640fee1
parentd05144246158bfdfbf560dfa26a6e5b2396fd101
Merge branch 'MDL-25138-master' of git://github.com/lameze/moodle