Merge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:20:07 +0000 (15:20 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:20:07 +0000 (15:20 +0800)
commitbc90ad107ae07c3c90b2e0e4ac1868083d3079c5
tree08263c5dfbe95482c7a5d89580abf26c32de8885
parentde0a6ed45994aa99be89a0672794c22f44dbaa4c
parent5cb2f1ad9a3b97d32b2c8d7ec42273ae1201375f
Merge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle