Merge branch 'MDL-28489_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 23:03:38 +0000 (11:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 23:03:38 +0000 (11:03 +1200)
commit239ed133f12bb6e7aad1cfdd7df1c93dc88f127a
treebe9562479603c706caa182ebe2d2b37dac1ba593
parent0c4a35b2f40f363a523f0df9a68b35de64d44174
parentc3b825e1b853aa5f676a192c1de6f62e772726c9
Merge branch 'MDL-28489_master' of git://github.com/stronk7/moodle