Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:04:22 +0000 (09:04 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Jun 2013 21:04:22 +0000 (09:04 +1200)
commit7b50002304418f46c36ea0c2cf642a7c57e44c50
tree133e31cb92c298050533a716958bb8ed02305950
parent9439d0506c59cd3cb7db2dd4099c6cec302c96c9
parent8ef3a22260f024f588df2f292d26dc7072639b2c
Merge branch 'MDL-39964-master' of git://github.com/danpoltawski/moodle

Conflicts:
lib/deprecatedlib.php
lib/deprecatedlib.php
lib/moodlelib.php