Merge branch 'MDL-38759-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Jul 2013 20:58:14 +0000 (08:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Jul 2013 20:58:14 +0000 (08:58 +1200)
commit0d33dbd9b87a77d397c6e5c53e4a4319a552e4e4
tree940892e8181244781ac09e123d9c809342f5c21a
parent73b4c1da844fcff99c8c21a54a8d05b0dc95d82d
parentfe96447b2bc9cb4a7fe1a5c36fc76d5fe2560b5f
Merge branch 'MDL-38759-master' of https://github.com/mackensen/moodle