Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Mar 2014 07:03:02 +0000 (15:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Mar 2014 07:03:02 +0000 (15:03 +0800)
commitcf77b7c9325fe469144daa2e6b2e39d0c9c64a39
tree6247e26e54d610e44678c8c2b8e1b0022dd4dfec
parent695a18b6aa9661f812a1a745a888df5acdbd7bc6
parentae29096b5b100994d4b015a3a76ba701d3b4b019
Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle