Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 06:19:10 +0000 (14:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 06:19:10 +0000 (14:19 +0800)
commita308dc15c94572e1c10f69c1ec81b73a9dc04723
tree3bcb7eeab6afddc101aaae67a59b972bf3db548e
parenta27c42ee9af795e3b25e3583ef45a209a0c5f3f2
parentbb3500c6d4d1deaafedb32972c512825cd509a66
Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle