Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 06:20:41 +0000 (14:20 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 19 Aug 2014 06:20:41 +0000 (14:20 +0800)
commit7e4475d37ce6e9150601c465917782434b83e923
tree76e7863768c0d2131d4994fa805c1872895e76f7
parentc86ae8660cd7482b448f240a62fd0e52ae2db38e
parentdfaedf085487397ba43936e8a936eaa7776f9243
Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle