Merge branch 'MDL-46916' of git://github.com/timhunt/moodle
commitb7e662bb1327c221ff3faa27ce378f927f2df1e4
authorMarina Glancy <marina@moodle.com>
Mon, 25 Aug 2014 08:49:52 +0000 (25 16:49 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 25 Aug 2014 08:49:52 +0000 (25 16:49 +0800)
treec35541f97bee465506fb0deaa42d3e3ca74d636c
parenta88770d7eb086f09a604abdd33c868dcdf7c89ec
parent6d99e71847c467d14e3cb64d611367a731e08b7b
Merge branch 'MDL-46916' of git://github.com/timhunt/moodle