Merge branch 'MDL-30322' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 00:02:15 +0000 (13:02 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 00:02:15 +0000 (13:02 +1300)
commit4117b4fcd8fd46ca1000d107722118c395f9c50b
tree88a613a211099ab74a161593ab141c3791ee2f08
parentb64a3e1ac13570363ca9d7f0490fc9c863e0a567
parent7d087744cb9c4d468bd4454f0b3e3e7e424c4377
Merge branch 'MDL-30322' of git://github.com/timhunt/moodle