Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 07:57:27 +0000 (15:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Jun 2015 07:57:27 +0000 (15:57 +0800)
commit489878ad0967c9880dfc908b622da65a2713c586
tree62e844edc0896d3e9dcc37a4e906210b368b0870
parent21a0a68196da25f30f28a04d31ecb37997d22c82
parente51bdc0bcca4578d24f592c2ffef91b2187ddaf4
Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle