Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 07:41:11 +0000 (15:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jun 2013 07:41:11 +0000 (15:41 +0800)
commit75eb51818cf505a5a63132d182aebb18a06ddd27
tree9ba1d9b7ceaf641dbc404c3f6ab88692cb9d7c5c
parent2504dfd61d1b5c0b269aaee7b200a46ebe9d60cc
parentca96789d77b34bd733e6c491ba79e3ab21d7e86f
Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle