Merge branch 'wip-MDL-46834-m27' of git://github.com/marinaglancy/moodle into MOODLE_...
commit20758f187d34cf073fc8abd022cf1a3151e49883
authorDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 07:11:12 +0000 (9 08:11 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Sep 2014 07:11:12 +0000 (9 08:11 +0100)
tree6cd6f4bbd34c65dfc334da49a4687e4654dbae25
parent309c82bf0e952f8a1aaae7f0decd7b36bbff3531
parentd0965c1dc4e6153050f48886c81e1fa9e5e53b70
Merge branch 'wip-MDL-46834-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE