Merge branch 'MDL-29415' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:15:04 +0000 (11:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:15:04 +0000 (11:15 +1200)
commit2b834a1d06606a43b548a1f4ff3370cbd4650598
treeeded50714d4d8226243fce5d7507c5a561c05d71
parentb610f1d4d721d246c529fe80c4a7e661fc561475
parent018213bed2662669badb3845ede9b6c0ca5b4b03
Merge branch 'MDL-29415' of git://github.com/stronk7/moodle