Merge branch 'wip-MDL-44321-master-fix2' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 03:08:31 +0000 (11:08 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 03:08:31 +0000 (11:08 +0800)
commitcb34249fe08cc14a4cbfcc0c3cdd71afb48de6d3
tree54259b700983e68ab6b6f13a0fbcb0376373533d
parent673a96bd4eb18e428e9d68c9cdcd59272bf8f7e3
parentf2f7065895437a19fc5ce259a48af7971ce2b262
Merge branch 'wip-MDL-44321-master-fix2' of git://github.com/marinaglancy/moodle