Merge branch 'MDL-37176' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 21:12:37 +0000 (10:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Dec 2012 21:12:37 +0000 (10:12 +1300)
commita483113178db73e6f99c0fc0704bd313f6b514a2
tree0c1b01e4cc978f6c359700eb58897eedaf65c551
parentbdd7b01a33b109143cb1b4baa22450d8e5971d95
parentc50c84bbaeca53ddb4b91fd3c0c6e45c7cf5cb7c
Merge branch 'MDL-37176' of git://github.com/stronk7/moodle