Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 04:30:12 +0000 (12:30 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 04:30:12 +0000 (12:30 +0800)
commit9261a3b0d109b79901d2b9925131fac70c32c34f
tree1ccae72b08b0183f4f20855f4e46b0a0cb48b81d
parentfeb09881fb4d3c9685b58a9ed6b5b29b74cc3c70
parent89cf999a8ddacb4d173a877340242c3dc0bbf3ec
Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle