Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Jan 2014 01:39:03 +0000 (09:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Jan 2014 01:39:03 +0000 (09:39 +0800)
commit7508094a87eec9578d82fd57590e8aac1321ec25
tree6b7590f723a9321fcaff349411499688d626fc95
parent852c34e5092de7d2db773d556bdc3cee2cc3c983
parentff7139d6cbe3a430344dcb6eb206fca34adc9680
Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle