Merge branch 'MDL-30518' of git://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 03:05:26 +0000 (16:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 8 Dec 2011 03:05:26 +0000 (16:05 +1300)
commit9c6b40c614aa8416c6b1aefa4cfd649959e636b2
treed2ed3eb056990a8ddb739ffa8014b8c6ce22559b
parent4bd1fc7ef74995a794f73e2516e8085020c067cd
parent59c1a98c05eedc1a92ef5e6d60fe7d36536f8a3e
Merge branch 'MDL-30518' of git://github.com/mackensen/moodle