Merge branch 'MDL-50561-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 08:02:57 +0000 (16:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Jun 2015 08:02:57 +0000 (16:02 +0800)
commit61e4716383777e718fcde773a7c63dc161175032
treefef95dd20a46354982ede18edd2d599a1bf55119
parent336bded4f188336ad52395f506e8d595486bcb14
parent22918830529d04afb73e5a894260ffc5720ea9d8
Merge branch 'MDL-50561-master' of git://github.com/jleyva/moodle