Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 07:38:37 +0000 (15:38 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 07:38:37 +0000 (15:38 +0800)
commit260ea3d9a1550a16cada70d8a752e89ffb4dfbda
tree259ea79ceac49664e9d7bda9ac5132495d3e5ba0
parent02852c45b5797066dc9830f2991d8ed49f3f13ea
parent29b8b7c7ad7088fada1e5b37006177bc68eab421
Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle