Merge branch 'MDL-33984' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 13:56:54 +0000 (21:56 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 13:56:54 +0000 (21:56 +0800)
commita2be8d9dbe5fe6b25101f4a057e4a95ff1fe4238
tree8052f147823f80d5b5105d8eaf04515ccb6f8b61
parenta9ca93db95e2a1f55bffff09df03f76e8fc2ccf5
parent84874400c5db23352b7ccb914c844decff610549
Merge branch 'MDL-33984' of git://github.com/stronk7/moodle