Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Jan 2014 01:40:58 +0000 (09:40 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jan 2014 01:40:58 +0000 (09:40 +0800)
commitc8c8e6c2de76b0e8af9658a3e40ecd7427b826e4
tree6474f34cfa7b89aa7acc080d732261fcbdebd4f1
parentda272e6b6bc7ff2d4707f34dc7a0a4c18c4881b1
parent15f9dfad09c74c76ac8c2ef1e060b95037af5a7c
Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle