Merge branch 'MDL-27200' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:12:14 +0000 (11:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:12:14 +0000 (11:12 +1300)
commita46fe43ba2d43ee579e3e7e31c3ebaec45dc0b6e
tree89733e746b9d43b1472d2adcdc90763b6cf32af5
parentf6b2946a06fc7770187203e2313fa8614628e63d
parent658ad69fa061c91412268e7605fa05166bd1f523
Merge branch 'MDL-27200' of git://github.com/timhunt/moodle