Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:54:28 +0000 (12:54 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:54:28 +0000 (12:54 +0800)
commit9cbb0944c91341580971bf7b39881511ab609dfb
tree378c90419fe0eec3c7cffcb596b79c60b7f4c812
parentd0827c938fdfd4de0ac4be87ebe197a0cc02ba32
parentc25c3c07b469d6259e3bde8ca3bd3f15aad77e70
Merge branch 'MDL-28705_master' of git://github.com/dmonllao/moodle