Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 14:36:54 +0000 (14:36 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 14:36:54 +0000 (14:36 +0000)
commitfef5360053693ae95ea17aa48c948405a01491e5
tree77d2959a5f02b30a23489889c56572079e1d3ae4
parentf0ad27291e22b7a730a5bc0d1edfb8a0f4e2fc0f
parent89e68e6c1e98feb6ab2f4bba28ca7c0c639b4635
Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle