Merge branch 'MDL-36826-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:38:57 +0000 (11:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Nov 2012 22:38:57 +0000 (11:38 +1300)
commit0aa6247168f6445373b0361b944cc956161abefd
tree76069b32427287e257bf4ed9375a7c92085f49ae
parenta28e3a600749eb84dcf92f8e8e5e500df0ff9198
parent41d3bc0ca0a2f90cf8984c537bfc345c0ae4e755
Merge branch 'MDL-36826-master' of git://github.com/damyon/moodle