Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 21:57:09 +0000 (10:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 27 Nov 2012 21:57:09 +0000 (10:57 +1300)
commitfd6ab92b1dc5052f3ad978a92091baf2b09da949
tree5b58a7c7a9afe8a42208df2537e4ff222301c8f5
parente002d5e4352d19a4bbffb72640251e958a0acb49
parent11e766020bd8e05b59550d3164e1a2cd20cc8ad9
Merge branch 'MDL-35997-wip1' of git://github.com/mouneyrac/moodle

Conflicts:
version.php
lang/en/webservice.php
lib/external/externallib.php
version.php