Merge branch 'MDL-37697-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 21:17:01 +0000 (10:17 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 21:17:01 +0000 (10:17 +1300)
commit41f3d113f72e42f33b8a6ed88b55f6cd4056cfcc
tree19835b21ed6d2dbd152f121e6e9caf38a0c8bfed
parent49c204d1ee7e033df8a5c1623dce24ce7c9b9f9c
parentc112bc6069879ee2e8843299af215ea2aef4fef2
Merge branch 'MDL-37697-m' of git://github.com/andrewnicols/moodle