Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)
commit2c9c8c7f461e43cf8f8ffc09d49700732519e15c
tree79e20e182402ff99b3fb7b66cb32da9c968a8588
parent00ae4c4ead9d0ca85d2c9790a8021c95db63ae9c
parentabe572e3f2c836d16881122e5a039ec169d4901d
Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle