Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 03:48:00 +0000 (11:48 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:56:58 +0000 (08:56 +0800)
commit9b0cc9ddf2bfc99245ea264b80f42cc9361994b9
tree60b81a7cec5071aa605dbaa1a8d01e9dae62f6ff
parentfc74cc8238d679d50843042bdebd64164ef787b6
parent862ca7dbc1e561506ad0551b71664a968f21a5cb
Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle