Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle
commitc3b545a92afaa34c836212f42441623cdd171670
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 08:57:56 +0000 (23 16:57 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:09 +0000 (24 11:48 +0200)
treede741d20021c71cf70e774a1da680d30b5d28f7f
parent13c9e9c0431e699f82abecf4e7ff529038fd0019
parentc42d18183a633625745d089523971de8e6aaadaa
Merge branch 'wip-MDL-47675-master' of git://github.com/abgreeve/moodle