Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle
commit87c1a30b1f93f0195dec9ac77b0844903cb54614
authorMarina Glancy <marina@moodle.com>
Mon, 26 May 2014 06:40:56 +0000 (26 14:40 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 26 May 2014 06:40:56 +0000 (26 14:40 +0800)
treec92e46393537ebb7ea52a09fee1c56765acee0bb
parent8a564deb07e6dc135c1f42445ac1a8ed4c602866
parent4e2bf2381f1f65b661e421cbbe2e00e44520776a
Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle