Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 07:57:58 +0000 (15:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 07:57:58 +0000 (15:57 +0800)
commit82fc6ae6e3baab873b4d0e22d5ef04482358e85b
treea76734de9e23368b512f5d636633f5904b8262a1
parent071d8ea75b109af705cfc06a35214401fd54b13b
parentdb48ed64c7b3872014dc1f5a61ac627dbf0aaa91
Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle